[PATCH,HURD] Fix GNU/Hurd menu entry generation

[Samuel Thibault]

Hello,

The patch below fixes menu entry generation for GNU/Hurd.
Samuel

2009-20-26  Samuel Thibault  <samuel.thiba...@ens-lyon.org>

        * util/grub.d/30_os-prober.in: Add GNU/Hurd support
        * util/grub.d/10_hurd.in: Translate grub device name into mach
        device name.

Index: util/grub.d/30_os-prober.in
===================================================================
--- util/grub.d/30_os-prober.in (révision 2657)
+++ util/grub.d/30_os-prober.in (copie de travail)
@@ -155,7 +155,28 @@
 EOF
     ;;
     hurd|*)
-      echo "  ${LONGNAME} is not yet supported by grub-mkconfig." >&2
+      cat << EOF
+menuentry "${LONGNAME} (on ${DEVICE})" {
+EOF
+      prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
+      GRUB_DEVICE="`${grub_probe} --device ${DEVICE} --target=drive`"
+      mach_device="`echo "${GRUB_DEVICE}" | tr -d '()' | tr , s`"
+      HURD_FS="`${grub_probe} --device ${DEVICE} --target=fs`"
+      case "${GRUB_FS}" in
+       *fs)    hurd_fs="${GRUB_FS}" ;;
+       *)      hurd_fs="${GRUB_FS}fs" ;;
+      esac
+      cat << EOF
+       multiboot /boot/gnumach.gz root=device:${mach_device}
+       module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
+                       --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)'
+       module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)'
+}
+EOF
     ;;
   esac
 done
Index: util/grub.d/10_hurd.in
===================================================================
--- util/grub.d/10_hurd.in      (révision 2657)
+++ util/grub.d/10_hurd.in      (copie de travail)
@@ -48,6 +48,7 @@
   *fs) hurd_fs="${GRUB_FS}" ;;
   *)   hurd_fs="${GRUB_FS}fs" ;;
 esac
+mach_device="`echo "${GRUB_DEVICE}" | tr -d '()' | tr , s`"
 
 for i in /hurd/${hurd_fs}.static /hurd/exec ; do
   if test -e "$i" ; then
@@ -73,7 +74,7 @@
 EOF
 prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
 cat << EOF
-       multiboot ${kernel} root=device:${GRUB_DEVICE}
+       multiboot ${kernel} root=device:${mach_device}
        module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
                        --multiboot-command-line='\${kernel-command-line}' \\
                        --host-priv-port='\${host-port}' \\


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel