=== modified file 'util/grub.d/00_header.in'
--- old/util/grub.d/00_header.in	2009-12-16 20:25:37 +0000
+++ new/util/grub.d/00_header.in	2009-12-20 01:45:32 +0000
@@ -45,10 +45,13 @@
 set default="${GRUB_DEFAULT}"
 if [ \${prev_saved_entry} ]; then
   set saved_entry=\${prev_saved_entry}
-  save_env saved_entry
-  set prev_saved_entry=
-  save_env prev_saved_entry
-  set boot_once=true
+  if save_env saved_entry; then
+    set prev_saved_entry=
+    save_env prev_saved_entry
+    set boot_once=true
+  else
+    set default=\${prev_saved_entry}
+  fi
 fi
 
 function savedefault {