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

* util/grub-mkrescue.in: Add explicit root argument to --set to

Browse source 
prevent the UUID being interpreted as an argument to --set (matches
previous change to prepare_grub_to_access_device).
This commit is contained in:
Colin Watson 2010-09-20 13:14:44 +01:00
parent a63c31b62d
commit c982589f0c
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-09-20 Colin Watson <cjwatson@ubuntu.com>
* util/grub-mkrescue.in: Add explicit root argument to --set to
prevent the UUID being interpreted as an argument to --set (matches
previous change to prepare_grub_to_access_device).
2010-09-20 Colin Watson <cjwatson@ubuntu.com> 2010-09-20 Colin Watson <cjwatson@ubuntu.com>
* kern/emu/hostdisk.c: Include <sys/ioctl.h> and <sys/disklabel.h> * kern/emu/hostdisk.c: Include <sys/ioctl.h> and <sys/disklabel.h>

2
util/grub-mkrescue.in
View file

@ -202,7 +202,7 @@ make_image ()
mkdir -p ${memdisk_dir}/boot/grub mkdir -p ${memdisk_dir}/boot/grub
cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
search --fs-uuid --set ${iso_uuid} search --fs-uuid --set=root ${iso_uuid}
set prefix=(\${root})/boot/grub/${platform} set prefix=(\${root})/boot/grub/${platform}
source \$prefix/grub.cfg source \$prefix/grub.cfg
EOF EOF