2010-02-25 Jordan Uggla <jordan.uggla@gmail.com>

	* util/grub-mkconfig.in (GRUB_SAVEDEFAULT): Export new variable.
	* util/grub-mkconfig_lib.in (save_default_entry): Only save a new
	default entry if GRUB_SAVEDEFAULT=true.  This allows using
	GRUB_DEFAULT=saved on its own to let grub-reboot work, without
	saving a new default on every boot.

diff --git a/ChangeLog b/ChangeLog
index 24981a5fc937f69d48a2f532e6ddaa5ec4390b31..b8f6ba35db53a32b542e622a657ae1e749b4d43f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-25  Jordan Uggla  <jordan.uggla@gmail.com>
+
+       * util/grub-mkconfig.in (GRUB_SAVEDEFAULT): Export new variable.
+       * util/grub-mkconfig_lib.in (save_default_entry): Only save a new
+       default entry if GRUB_SAVEDEFAULT=true.  This allows using
+       GRUB_DEFAULT=saved on its own to let grub-reboot work, without
+       saving a new default on every boot.
+
 2010-02-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * normal/crypto.c (read_crypto_list): Fix a memory leak.

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index fb1dd454494160096bbf16cb2b46383a0fd2e6ed..daa110be7c8caf0ae08ff70ff62841aeee41998d 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -223,7 +223,8 @@ export GRUB_DEFAULT \
   GRUB_THEME \
   GRUB_GFXPAYLOAD_LINUX \
   GRUB_DISABLE_OS_PROBER \
-  GRUB_INIT_TUNE
+  GRUB_INIT_TUNE \
+  GRUB_SAVEDEFAULT
 
 if test "x${grub_cfg}" != "x"; then
   rm -f ${grub_cfg}.new

diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 45354041a9b26412dab74d0d67a485fe5c5f2be3..bcd6baffb3cfa9fcc48b21b72eaa0efd96470d2f 100644 (file)
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -96,7 +96,7 @@ convert_system_path_to_grub_path ()
 
 save_default_entry ()
 {
-  if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then
+  if [ "x${GRUB_SAVEDEFAULT}" = "xtrue" ] ; then
     cat << EOF
 savedefault
 EOF