2010-01-24 Samuel Thibault <samuel.thibault@ens-lyon.org>

	* util/grub.d/10_hurd.in: Add a recovery mode.

diff --git a/ChangeLog b/ChangeLog
index cec7af8a52161d3582d338c25e9665bac3f2cdc5..ee582693f09a63ddfba1a471ee75ac631675f8dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-24  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+       * util/grub.d/10_hurd.in: Add a recovery mode.
+
 2010-01-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * configure.ac: Check for libgcc symbols with -nostdlib.

diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index 65a9a70b155e2cda97eb6183b4c64c742bdcc652..8c9060932df18cf3d987723c9879d822fe1bff01 100644 (file)
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -89,3 +89,25 @@ cat << EOF
        module          /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)'
 }
 EOF
+
+cat << EOF
+menuentry "${OS} (recovery mode)" {
+EOF
+prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
+cat << EOF
+       echo            $(gettext "Loading GNU Mach ...")
+       multiboot       ${kernel} root=device:${GRUB_DEVICE#/dev/} -s
+EOF
+save_default_entry | sed -e "s/^/\t/"
+prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
+cat << EOF
+       echo            $(gettext "Loading the Hurd ...")
+       module          /hurd/${hurd_fs}.static ${hurd_fs} \\
+                       --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