2009-12-08 Colin Watson <cjwatson@ubuntu.com>

	* util/grub.d/00_header.in: Use `set var=val' rather than plain
	`var=val'.
	* util/grub-mkconfig_lib.in (save_default_entry): Likewise.

diff --git a/ChangeLog.savedefault b/ChangeLog.savedefault
index 55500a67c7ef58f292e359bcdbbee606b3617193..25811c79bfe3ef9d602ae6485d3dace3e5678ec0 100644 (file)
--- a/ChangeLog.savedefault
+++ b/ChangeLog.savedefault
@@ -1,3 +1,9 @@
+2009-12-08  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub.d/00_header.in: Use `set var=val' rather than plain
+       `var=val'.
+       * util/grub-mkconfig_lib.in (save_default_entry): Likewise.
+
 2009-12-08  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/grub-reboot.in: Fix --version output.

diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index d18002ce4b3e339c2d68c14d8689ca47480f5592..95fd02ad96b9c48dc5e7d084b7b2eb4c252ba312 100644 (file)
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -93,7 +93,7 @@ convert_system_path_to_grub_path ()
 save_default_entry ()
 {
   if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then
-    echo 'saved_entry=${chosen}'
+    echo 'set saved_entry=${chosen}'
     echo 'save_env saved_entry'
   fi
 }

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 2bcfe1d2544a69d0b5b9a93615d69319f2643a35..4cd8fd30c4518ed727afed39f6d6e306aa0befff 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -44,9 +44,9 @@ if [ -s \$prefix/grubenv ]; then
 fi
 set default="${GRUB_DEFAULT}"
 if [ \${prev_saved_entry} ]; then
-  saved_entry=\${prev_saved_entry}
+  set saved_entry=\${prev_saved_entry}
   save_env saved_entry
-  prev_saved_entry=
+  set prev_saved_entry=
   save_env prev_saved_entry
 fi
 EOF