From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 20 Sep 2010 12:14:44 +0000 (+0100)
Subject: * util/grub-mkrescue.in: Add explicit root argument to --set to
X-Git-Tag: 1.99~467
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c982589f0c6a44bf7091dacacd726a683a438e9c;p=thirdparty%2Fgrub.git

* 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).
---

diff --git a/ChangeLog b/ChangeLog
index 0aaeb74d9..721410445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* kern/emu/hostdisk.c: Include <sys/ioctl.h> and <sys/disklabel.h>
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 142ee85cd..f2714c486 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -202,7 +202,7 @@ make_image ()
     mkdir -p ${memdisk_dir}/boot/grub
 
     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}
 source \$prefix/grub.cfg
 EOF