Bug#146820: hurd: MAKEDEV doesn't understand device:hdXsY syntax

[Alfred M. Szmidt]

Hi,

There seem to be more problems with the native-install script than
just the one where it doesn't parse the device: part.

Since people now use GRUB most of the time the module line for
ext2fs.static usualy looks something like this:

module (hd0,4)/hurd/ext2fs.static 
--multiboot-command-line=${kernel-command-line} --host-priv-port=${host-port} 
--device-master-port=${device-port} --exec-server-task=${exec-task} -T typed 
${root} $(task-create) $(task-resume)

This will cause problems with the current native-install parsing code
for such things. As `fstype' depends that the line for `fsysopts /'
should not have the `(hd0,4)' bit.

This patch will fix both the "device:" parse bug and the bug above.

--- /gnu/native-install Tue Apr 23 00:10:45 2002
+++ native-install      Mon May 13 16:34:57 2002
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 1998, 1999, 2000  by Marcus Brinkmann.
+# Copyright (c) 1998, 1999, 2000, 2002  by Marcus Brinkmann.
 # Licensed under the GNU GPLv2 or later.
 #
 # Parts of this script was taken from the SETUP script in Hurd CVS. 
@@ -155,9 +155,9 @@
 
 echo The last step is to create /etc/fstab.
 
-fstype=`fsysopts / | perl -ne 'm!^/hurd/(.*?)\.static.*?([^\s]+)\s*?$!; print 
$1;'`
-rootpart=`fsysopts / | perl -ne 'm!^/hurd/(.*?)\.static.*?([^\s]+)\s*?$!; 
print $2;'`
-
+fstype=`fsysopts / | perl -ne 'm!^.*/hurd/(.*?)\.static.*?([^\s]+)\s*?$!; 
print $1;'`
+ rootpart=`echo "/hurd/ext2fs.static --writable --sync=5 --store-type=typed 
hd0s5" | perl -ne 'm!^.*/hurd/(.*?)\.static.*?([^\s]+)\s*?$!; print $2;' | sed 
-e "s/^device\://"`
+ 
 if [ ! -e /dev/${rootpart} ] ; then
        cd /dev
        /bin/sh ./MAKEDEV ${rootpart} || true

-- 
Alfred M. Szmidt