=== modified file 'util/grub-mkconfig_lib.in'
--- old/util/grub-mkconfig_lib.in	2009-12-16 20:22:36 +0000
+++ new/util/grub-mkconfig_lib.in	2009-12-16 20:25:37 +0000
@@ -97,10 +97,7 @@
 save_default_entry ()
 {
   if [ "x${GRUB_SAVEDEFAULT}" = "xtrue" ] ; then
-    echo 'if [ ${boot_once} != true ]; then'
-    echo '	set saved_entry=${chosen}'
-    echo '	save_env saved_entry'
-    echo 'fi'
+    echo 'savedefault'
   fi
 }
 

=== modified file 'util/grub.d/00_header.in'
--- old/util/grub.d/00_header.in	2009-12-16 20:12:30 +0000
+++ new/util/grub.d/00_header.in	2009-12-16 20:25:37 +0000
@@ -50,6 +50,14 @@
   save_env prev_saved_entry
   set boot_once=true
 fi
+
+function savedefault {
+  if [ \${boot_once} != true ]; then
+    set saved_entry=\${chosen}
+    save_env saved_entry
+  fi
+}
+
 EOF
 
 case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in