vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
robertmh 2009-10-24 23:03:02 +00:00
parent 0933cdc0ab
commit f669389090
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2009-10-21 Felix Zielcke <fzielcke@z-51.de>
* config.guess: Update to latest version from config git * config.guess: Update to latest version from config git

4
docs/grub.cfg
View file

@ -15,13 +15,13 @@ set fallback=1
menuentry "GNU (aka GNU/Hurd)" { menuentry "GNU (aka GNU/Hurd)" {
set root=(hd0,1) set root=(hd0,1)
multiboot /boot/gnumach.gz root=device:hd0s1 multiboot /boot/gnumach.gz root=device:hd0s1
module /hurd/ext2fs.static --readonly \ module /hurd/ext2fs.static ext2fs --readonly \
--multiboot-command-line='${kernel-command-line}' \ --multiboot-command-line='${kernel-command-line}' \
--host-priv-port='${host-port}' \ --host-priv-port='${host-port}' \
--device-master-port='${device-port}' \ --device-master-port='${device-port}' \
--exec-server-task='${exec-task}' -T typed '${root}' \ --exec-server-task='${exec-task}' -T typed '${root}' \
'$(task-create)' '$(task-resume)' '$(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 # For booting GNU/Linux

4
util/grub.d/10_hurd.in
View file

@ -74,12 +74,12 @@ EOF
prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
cat << EOF cat << EOF
multiboot ${kernel} root=device:${GRUB_DEVICE} 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}' \\ --multiboot-command-line='\${kernel-command-line}' \\
--host-priv-port='\${host-port}' \\ --host-priv-port='\${host-port}' \\
--device-master-port='\${device-port}' \\ --device-master-port='\${device-port}' \\
--exec-server-task='\${exec-task}' -T typed '\${root}' \\ --exec-server-task='\${exec-task}' -T typed '\${root}' \\
'\$(task-create)' '\$(task-resume)' '\$(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 EOF