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

	* util/grub.d/00_header.in: Silently ignore zero-sized environment
	blocks.

diff --git a/ChangeLog.savedefault b/ChangeLog.savedefault
index 6f885a73f2e5efd60598bacde1eda1f3a4e60867..cdeb05a87b3ca52db2a0b202cd5847c80b9b9137 100644 (file)
--- a/ChangeLog.savedefault
+++ b/ChangeLog.savedefault
@@ -1,3 +1,8 @@
+2009-12-08  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub.d/00_header.in: Silently ignore zero-sized environment
+       blocks.
+
 2009-12-08  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/grub.d/00_header.in: Quote the value assigned to `default',

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index e8c3a14c48d4ff34e793265194baa4bdcc78c989..2bcfe1d2544a69d0b5b9a93615d69319f2643a35 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -39,7 +39,9 @@ if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
 if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=640x480 ; fi
 
 cat << EOF
-load_env
+if [ -s \$prefix/grubenv ]; then
+  load_env
+fi
 set default="${GRUB_DEFAULT}"
 if [ \${prev_saved_entry} ]; then
   saved_entry=\${prev_saved_entry}