* util/grub.d/00_header.in: Quote values assigned to `saved_entry',

in case they contain spaces.

diff --git a/ChangeLog b/ChangeLog
index 65a3c69b89128fed7eb615dc07ac78dd34e07bbd..779973f1e7efbedb663c616d15ac95bc88440a13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-05  Colin Watson  <cjwatson@debian.org>
+
+       * util/grub.d/00_header.in: Quote values assigned to `saved_entry',
+       in case they contain spaces.
+
 2010-06-04  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Prepend

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 0a5cfac18217255947e4972bffcac3d39334df0d..199a1d7af687cce49215b3da9e8a63b190cba211 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -62,7 +62,7 @@ EOF
 fi
 cat <<EOF
 if [ \${prev_saved_entry} ]; then
-  set saved_entry=\${prev_saved_entry}
+  set saved_entry="\${prev_saved_entry}"
   save_env saved_entry
   set prev_saved_entry=
   save_env prev_saved_entry
@@ -71,7 +71,7 @@ fi
 
 function savedefault {
   if [ -z \${boot_once} ]; then
-    saved_entry=\${chosen}
+    saved_entry="\${chosen}"
     save_env saved_entry
   fi
 }