reimported savedefault by cjwatson and myself

Also-By: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>

util/grub.d/00_header.in

@@ -32,11 +32,19 @@ for i in ${GRUB_PRELOAD_MODULES} ; do
 done
 
 if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi
+if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then GRUB_DEFAULT='${saved_entry}' ; fi
 if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
 if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=640x480 ; fi
 
 cat << EOF
+load_env
 set default=${GRUB_DEFAULT}
+if [ \${prev_saved_entry} ]; then
+  saved_entry=\${prev_saved_entry}
+  save_env saved_entry
+  prev_saved_entry=
+  save_env prev_saved_entry
+fi
 EOF
 
 case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in

util/grub.d/10_hurd.in

@@ -75,6 +75,7 @@ prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
 cat << EOF
 	multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/}
 EOF
+save_default_entry | sed -e "s/^/\t/"
 prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
 cat << EOF
 	module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\

util/grub.d/10_kfreebsd.in

@@ -39,6 +39,7 @@ kfreebsd_entry ()
   args="$4"	# not used yet
   title="$(gettext "%s, with kFreeBSD %s")"
   printf "menuentry \"${title}\" {" ${os} ${version}
+  save_default_entry | sed -e "s/^/\t/"
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi

util/grub.d/10_linux.in

@@ -59,6 +59,7 @@ linux_entry ()
     title="$(gettext "%s, with Linux %s")"
   fi
   printf "menuentry \"${title}\" {" ${os} ${version}
+  save_default_entry | sed -e "s/^/\t/"
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi

util/grub.d/10_windows.in

@@ -73,6 +73,7 @@ for dir in $dirlist ; do
 menuentry "$OS" {
 EOF
 
+  save_default_entry | sed -e 's,^,\t,'
   prepare_grub_to_access_device "$dev" | sed 's,^,\t,'
 
   cat << EOF

util/grub.d/30_os-prober.in

@@ -55,6 +55,7 @@ for OS in ${OSPROBED} ; do
       cat << EOF
 menuentry "${LONGNAME} (on ${DEVICE})" {
 EOF
+      save_default_entry | sed -e "s/^/\t/"
       prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
 
       case ${LONGNAME} in
@@ -113,6 +114,8 @@ EOF
         cat << EOF
 menuentry "${LONGNAME} (on ${DEVICE})" {
 EOF
+	save_default_entry | sed -e "s/^/\t/"
+	save_default_entry | sed -e "s/^/\t/"
 	prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
 	cat << EOF
         insmod vbe