From 3af94538b64bd1787ea4f27ee1e007e20fa022afd69f6c94731c722d37f0d658 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 30 Jan 2013 07:29:03 +0000 Subject: [PATCH] Accepting request 150359 from home:arvidjaar:branches:Base:System - remove obsolete reference to /boot/grub2-efi and /usr/sbin/grub2-efi from grub2-once - add GRUB_SAVEDFAULT description to /etc/default/grub OBS-URL: https://build.opensuse.org/request/show/150359 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=11 --- grub.default | 4 ++++ grub2-once | 5 +---- grub2.changes | 7 +++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/grub.default b/grub.default index 285681f..835eb80 100644 --- a/grub.default +++ b/grub.default @@ -9,6 +9,10 @@ GRUB_TIMEOUT=10 GRUB_CMDLINE_LINUX_DEFAULT="quiet splash=silent" GRUB_CMDLINE_LINUX="" +# Uncomment to automatically save last booted menu entry in GRUB2 environment +# variable `saved_entry' +#GRUB_SAVEDEFAULT="true" + # Uncomment to enable BadRAM filtering, modify to suit your needs # This works with Linux (no patch required) and with any kernel that obtains # the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...) diff --git a/grub2-once b/grub2-once index f9fcf3a..2ed9488 100644 --- a/grub2-once +++ b/grub2-once @@ -45,12 +45,9 @@ $grub2_dir = ""; while () { if (/LOADER_TYPE="(.*)"/) { my $bl = $1; - if ($bl eq "grub2") { + if ($bl eq "grub2" || $bl eq "grub2-efi") { $grub2_dir = "/boot/grub2"; $grub2_reboot = "/usr/sbin/grub2-reboot"; - } elsif ($bl eq "grub2-efi") { - $grub2_dir = "/boot/grub2-efi"; - $grub2_reboot = "/usr/sbin/grub2-efi-reboot"; } last; } diff --git a/grub2.changes b/grub2.changes index 87a3f84..e859c25 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 30 04:36:45 UTC 2013 - arvidjaar@gmail.com + +- remove obsolete reference to /boot/grub2-efi and /usr/sbin/grub2-efi + from grub2-once +- add GRUB_SAVEDFAULT description to /etc/default/grub + ------------------------------------------------------------------- Fri Jan 18 07:39:18 UTC 2013 - mchang@suse.com