2009-12-08 Colin Watson <cjwatson@ubuntu.com>

	* util/grub.d/30_os-prober.in: Fix merge error that moved a
	`save_default_entry' call from the macosx case to the linux case.

diff --git a/ChangeLog.savedefault b/ChangeLog.savedefault
index c18106bd525b90a1878dcda6c176348785aaee07..0810274a30cc8d7efd0af63d672a90d16bd0e950 100644 (file)
--- a/ChangeLog.savedefault
+++ b/ChangeLog.savedefault
@@ -1,3 +1,8 @@
+2009-12-08  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub.d/30_os-prober.in: Fix merge error that moved a
+       `save_default_entry' call from the macosx case to the linux case.
+
 2009-10-25  Vladimir Serbinenko  <phcoder@gmail.com>
 2009-10-25  Colin Watson  <cjwatson@ubuntu.com>
 

diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 0e71096d1b9dede830d34b2577537881e81fd777..f4a37d5f5e9f048757252c8d5b214cbdbbab93bf 100644 (file)
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -97,6 +97,7 @@ EOF
         cat << EOF
 menuentry "${LLABEL} (on ${DEVICE})" {
 EOF
+       save_default_entry | sed -e "s/^/\t/"
        if [ -z "${prepare_boot_cache}" ]; then
          prepare_boot_cache="$(prepare_grub_to_access_device ${LBOOT} | sed -e "s/^/\t/")"
        fi
@@ -119,7 +120,6 @@ 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