diff --git a/grub-2.00-openmamba_boot_choices-1.patch b/grub-2.00-openmamba_boot_choices-2.patch similarity index 77% rename from grub-2.00-openmamba_boot_choices-1.patch rename to grub-2.00-openmamba_boot_choices-2.patch index 1513e5f..3625aa9 100644 --- a/grub-2.00-openmamba_boot_choices-1.patch +++ b/grub-2.00-openmamba_boot_choices-2.patch @@ -1,8 +1,13 @@ -diff -Nru grub-2.00/util/grub.d/10_linux.in grub-2.00.patched/util/grub.d/10_linux.in ---- grub-2.00/util/grub.d/10_linux.in 2013-06-09 23:58:16.000000000 +0200 -+++ grub-2.00.patched/util/grub.d/10_linux.in 2014-09-13 00:01:34.261330957 +0200 -@@ -239,13 +239,35 @@ +diff -Nru grub-2.00.orig/util/grub.d/10_linux.in grub-2.00/util/grub.d/10_linux.in +--- grub-2.00.orig/util/grub.d/10_linux.in 2013-06-09 23:58:16.000000000 +0200 ++++ grub-2.00/util/grub.d/10_linux.in 2014-11-06 10:50:32.485907611 +0100 +@@ -237,15 +237,40 @@ + fi + # TRANSLATORS: %s is replaced with an OS name echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" ++ else ++ linux_entry "${OS}" "${version}" default \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" fi - linux_entry "${OS}" "${version}" advanced \ diff --git a/grub.spec b/grub.spec index 2f7331a..42e1c92 100644 --- a/grub.spec +++ b/grub.spec @@ -3,7 +3,7 @@ Name: grub Epoch: 1 Version: 2.00.bzr20130610 -Release: 7mamba +Release: 8mamba Summary: A Multiboot boot loader derived from GRUB, the GRand Unified Bootloader Group: System/Kernel and Hardware Vendor: openmamba @@ -21,7 +21,7 @@ Source3: grub-2.00-openmamba-conf-other Source4: %{name}2-sysconfig Source5: grub-2.00-openmamba-conf-other-linux Source6: %{name}2-conf-failsafe -Patch1: grub-2.00-openmamba_boot_choices-1.patch +Patch1: grub-2.00-openmamba_boot_choices-2.patch Patch2: grub-2.00-stdio.patch Patch3: %{name}2-1.97-sysconfig.patch Patch9: %{name}2-1.99-fix_saved_entry_default.patch @@ -357,6 +357,9 @@ fi %{_prefix}/lib/grub/x86_64-efi/* %changelog +* Thu Nov 06 2014 Silvan Calarco 2.00.bzr20130610-8mamba +- add default selection in advanced boot menu for when multiple kernels are installed + * Sat Oct 04 2014 Silvan Calarco 2.00.bzr20130610-7mamba - change build to fix user space arch on x86_64 and added more build options for bios version