=== modified file 'util/grub-mkconfig_lib.in'
--- old/util/grub-mkconfig_lib.in	2009-12-17 17:34:56 +0000
+++ new/util/grub-mkconfig_lib.in	2009-12-16 20:12:30 +0000
@@ -97,8 +97,10 @@
 save_default_entry ()
 {
   if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then
-    echo 'set saved_entry=${chosen}'
-    echo 'save_env saved_entry'
+    echo 'if [ ${boot_once} != true ]; then'
+    echo '	set 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-12-17 17:34:56 +0000
+++ new/util/grub.d/00_header.in	2009-12-16 20:12:30 +0000
@@ -48,6 +48,7 @@
   save_env saved_entry
   set prev_saved_entry=
   save_env prev_saved_entry
+  set boot_once=true
 fi
 EOF