From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 1 Nov 2010 11:49:40 +0000 (+0100)
Subject: 	* util/grub.d/10_hurd.in: Don't call savedefault on recovery entries.
X-Git-Tag: 1.99~357
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74aaf558ef2f114fdeccc527d2b8d1a202467eba;p=thirdparty%2Fgrub.git

	* 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 45e76b68a..20bf05920 100644
--- 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 350eb30a8..6490913ae 100644
--- 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 4d71b5a63..9cb2788df 100644
--- 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 5e522ba4a..7650ac9fa 100644
--- 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 d5833070d..649ae85dd 100644
--- 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/")"