2009-10-25 Robert Millan <rmh.grub@aybabtu.com>

        Patch from Samuel Thibault <samuel.thibault@ens-lyon.org>
        * docs/grub.cfg: Compensate for recent change in multiboot
        loader (since 2009-08-14 it won't pass filename to payload).
        * util/grub.d/10_hurd.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 2dd370aca4103f94ecd38faf84593afa9021b207..26a2c8f7cfe273dc265d08ddf2a7fa7236de561d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-25  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Patch from Samuel Thibault <samuel.thibault@ens-lyon.org>
+       * docs/grub.cfg: Compensate for recent change in multiboot
+       loader (since 2009-08-14 it won't pass filename to payload).
+       * util/grub.d/10_hurd.in: Likewise.
+
 2009-10-21  Felix Zielcke  <fzielcke@z-51.de>
 
        * config.guess: Update to latest version from config git

diff --git a/docs/grub.cfg b/docs/grub.cfg
index 4d1582a8ee0a0a5a6653f0aecbee0e10164d4c27..0a9ab6bc73e180c41970a5d7db6c9b250c163555 100644 (file)
--- a/docs/grub.cfg
+++ b/docs/grub.cfg
@@ -15,13 +15,13 @@ set fallback=1
 menuentry "GNU (aka GNU/Hurd)" {
        set root=(hd0,1)
        multiboot /boot/gnumach.gz root=device:hd0s1
-       module /hurd/ext2fs.static --readonly \
+       module /hurd/ext2fs.static ext2fs --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 /hurd/exec '$(exec-task=task-create)'
+       module /lib/ld.so.1 exec /hurd/exec '$(exec-task=task-create)'
 }
 
 # For booting GNU/Linux

diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index ec78a3532c82f2f3b1c110d985937d95e0003500..b52f374987a73b52cbdfd945bd6d3db42de8c22f 100644 (file)
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -74,12 +74,12 @@ EOF
 prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
 cat << EOF
        multiboot ${kernel} root=device:${GRUB_DEVICE}
-       module /hurd/${hurd_fs}.static --readonly \\
+       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 /hurd/exec '\$(exec-task=task-create)'
+       module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)'
 }
 EOF