* util/grub.d/10_hurd.in: Don't call savedefault on recovery entries.

	* util/grub.d/10_kfreebsd.in: Likewise.
	* util/grub.d/10_linux.in: Likewise.
	* util/grub.d/20_linux_xen.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 45e76b68a9fb9ae3287f89a2830ab27f3bc451fb..20bf05920d6c2c926813a8419245142ba16464b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub.d/10_hurd.in: Don't call savedefault on recovery entries.
+       * util/grub.d/10_kfreebsd.in: Likewise.
+       * util/grub.d/10_linux.in: Likewise.
+       * util/grub.d/20_linux_xen.in: Likewise.
+
 2010-11-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/lib/arg.c (grub_arg_parse): Avoid interpreting direct

diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index 350eb30a8a0057b5b1c8bf9f524381a325a05a3e..6490913aeb5c050e26f7ac4a48ae512f5b75641b 100644 (file)
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -107,7 +107,6 @@ EOF
        echo            '$(gettext_quoted "Loading GNU Mach ...")'
        multiboot       ${kernel} root=device:${GRUB_DEVICE#/dev/} -s
 EOF
-  save_default_entry | sed -e "s/^/\t/"
   prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
   cat << EOF
        echo            '$(gettext_quoted "Loading the Hurd ...")'

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 4d71b5a632b6fad2e1ef674d9238f23433f4663b..9cb2788dfba878317938852d162d7512b24853a4 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -76,7 +76,9 @@ kfreebsd_entry ()
     title="$(gettext_quoted "%s, with kFreeBSD %s")"
   fi
   printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"
-  save_default_entry | sed -e "s/^/\t/"
+  if ! ${recovery} ; then
+      save_default_entry | sed -e "s/^/\t/"
+  fi
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 5e522ba4ac364fea3a05be7d59411f6d22ad6757..7650ac9fa467c1864db17304e05f7d2df075421a 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -63,7 +63,9 @@ linux_entry ()
     title="$(gettext_quoted "%s, with Linux %s")"
   fi
   printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"
-  save_default_entry | sed -e "s/^/\t/"
+  if ! ${recovery} ; then
+      save_default_entry | sed -e "s/^/\t/"
+  fi
 
   # Use ELILO's generic "efifb" when it's known to be available.
   # FIXME: We need an interface to select vesafb in case efifb can't be used.

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index d5833070d79827bca7e948e8b3286298e9e452ba..649ae85dd1d9895f2c7967fe0fed09f1b4844baa 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -65,7 +65,9 @@ linux_entry ()
     title="$(gettext_quoted "%s, with Linux %s and XEN %s")"
   fi
   printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" "${xen_version}"
-  save_default_entry | sed -e "s/^/\t/"
+  if ! ${recovery} ; then
+      save_default_entry | sed -e "s/^/\t/"
+  fi
 
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"