pool/grub2
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 619362 from home:jmoellers:branches:Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/619362
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=304
This commit is contained in:
Michael Chang 2018-06-28 06:43:16 +00:00 committed by Git OBS Bridge
parent c8d455d46f
commit 0672e47ed0
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grub.default
View File

@ -33,7 +33,7 @@ GRUB_CMDLINE_LINUX=""
#GRUB_DISABLE_LINUX_UUID=true #GRUB_DISABLE_LINUX_UUID=true
# Uncomment to disable generation of recovery mode menu entries # Uncomment to disable generation of recovery mode menu entries
#GRUB_DISABLE_LINUX_RECOVERY="true" #GRUB_DISABLE_RECOVERY="true"
# Uncomment to get a beep at grub start # Uncomment to get a beep at grub start
#GRUB_INIT_TUNE="480 440 1" #GRUB_INIT_TUNE="480 440 1"

8
grub2.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jun 27 08:39:07 UTC 2018 - josef.moellers@suse.com
- Replace "GRUB_DISABLE_LINUX_RECOVERY" by "GRUB_DISABLE_RECOVERY"
in /etc/default/grub and remove test from s390x install
section in upec file.
[bsc#1042433, grub.default, grub2.spec]
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 20 09:21:48 UTC 2018 - josef.moellers@suse.com Wed Jun 20 09:21:48 UTC 2018 - josef.moellers@suse.com

3
grub2.spec
View File

@ -852,9 +852,6 @@ perl -ni -e '
sub END() { sub END() {
print "\n# on s390x always:\nGRUB_DISABLE_OS_PROBER=true\n"; print "\n# on s390x always:\nGRUB_DISABLE_OS_PROBER=true\n";
} }
if ( s{^#(GRUB_DISABLE_LINUX_RECOVERY)=\"?(true)\"?}{$1=$2} ) {
$_ .= "GRUB_DISABLE_RECOVERY=true\n";
}
if ( s{^#?(GRUB_TERMINAL)=(console|gfxterm)}{$1=console} ) { if ( s{^#?(GRUB_TERMINAL)=(console|gfxterm)}{$1=console} ) {
$_ .= "GRUB_GFXPAYLOAD_LINUX=text\n"; $_ .= "GRUB_GFXPAYLOAD_LINUX=text\n";
} }