[2644] 2009-10-25 Robert Millan <address@hidden>

[Robert Millan]

Revision: 2644
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2644
Author:   robertmh
Date:     2009-10-24 23:03:02 +0000 (Sat, 24 Oct 2009)
Log Message:
-----------
2009-10-25  Robert Millan  <address@hidden>

        Patch from Samuel Thibault <address@hidden>
        * 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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/docs/grub.cfg
    trunk/grub2/util/grub.d/10_hurd.in

Property Changed:
----------------
    trunk/grub2/


Property changes on: trunk/grub2
___________________________________________________________________
Modified: bzr:revision-info
   - 
   + timestamp: 2009-10-25 00:58:14.723000050 +0200
committer: Robert Millan <address@hidden>
properties: 
        branch-nick: tmp

Modified: bzr:revision-id:v3-single1-dHJ1bmsvZ3J1YjI.
   - 
   + 1769 address@hidden

Added: bzr:file-ids
   + 

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-10-21 12:22:05 UTC (rev 2643)
+++ trunk/grub2/ChangeLog       2009-10-24 23:03:02 UTC (rev 2644)
@@ -1,3 +1,10 @@
+2009-10-25  Robert Millan  <address@hidden>
+
+       Patch from Samuel Thibault <address@hidden>
+       * 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  <address@hidden>
 
        * config.guess: Update to latest version from config git

Modified: trunk/grub2/docs/grub.cfg
===================================================================
--- trunk/grub2/docs/grub.cfg   2009-10-21 12:22:05 UTC (rev 2643)
+++ trunk/grub2/docs/grub.cfg   2009-10-24 23:03:02 UTC (rev 2644)
@@ -15,13 +15,13 @@
 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

Modified: trunk/grub2/util/grub.d/10_hurd.in
===================================================================
--- trunk/grub2/util/grub.d/10_hurd.in  2009-10-21 12:22:05 UTC (rev 2643)
+++ trunk/grub2/util/grub.d/10_hurd.in  2009-10-24 23:03:02 UTC (rev 2644)
@@ -74,12 +74,12 @@
 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