=== modified file 'util/grub-mkconfig_lib.in'
--- old/util/grub-mkconfig_lib.in	2009-12-09 21:03:26 +0000
+++ new/util/grub-mkconfig_lib.in	2009-12-15 01:57:03 +0000
@@ -97,8 +97,10 @@
 save_default_entry ()
 {
   if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then
-    echo 'saved_entry=${chosen}'
-    echo 'save_env saved_entry'
+    echo 'if [ ${boot_once} != true ]; then'
+    echo '	saved_entry=${chosen}'
+    echo '	save_env saved_entry'
+    echo 'fi'
   fi
 }
 

=== modified file 'util/grub.d/00_header.in'
--- old/util/grub.d/00_header.in	2009-11-24 00:22:41 +0000
+++ new/util/grub.d/00_header.in	2009-12-15 01:57:03 +0000
@@ -46,6 +46,7 @@
   save_env saved_entry
   prev_saved_entry=
   save_env prev_saved_entry
+  set boot_once=true
 fi
 EOF