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
This commit is contained in:
Michael Chang 2013-01-30 07:29:03 +00:00 committed by Git OBS Bridge
parent 5e5fcf39b1
commit 3af94538b6
3 changed files with 12 additions and 4 deletions

View File

@ -9,6 +9,10 @@ GRUB_TIMEOUT=10
GRUB_CMDLINE_LINUX_DEFAULT="quiet splash=silent" GRUB_CMDLINE_LINUX_DEFAULT="quiet splash=silent"
GRUB_CMDLINE_LINUX="" 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 # Uncomment to enable BadRAM filtering, modify to suit your needs
# This works with Linux (no patch required) and with any kernel that obtains # This works with Linux (no patch required) and with any kernel that obtains
# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...) # the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)

View File

@ -45,12 +45,9 @@ $grub2_dir = "";
while (<SYSCONF>) { while (<SYSCONF>) {
if (/LOADER_TYPE="(.*)"/) { if (/LOADER_TYPE="(.*)"/) {
my $bl = $1; my $bl = $1;
if ($bl eq "grub2") { if ($bl eq "grub2" || $bl eq "grub2-efi") {
$grub2_dir = "/boot/grub2"; $grub2_dir = "/boot/grub2";
$grub2_reboot = "/usr/sbin/grub2-reboot"; $grub2_reboot = "/usr/sbin/grub2-reboot";
} elsif ($bl eq "grub2-efi") {
$grub2_dir = "/boot/grub2-efi";
$grub2_reboot = "/usr/sbin/grub2-efi-reboot";
} }
last; last;
} }

View File

@ -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 Fri Jan 18 07:39:18 UTC 2013 - mchang@suse.com