From 0672e47ed01db5b7851d349e2bf2b5834cb0c88c82e5c205ead3bf632fb720b3 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 28 Jun 2018 06:43:16 +0000 Subject: [PATCH] Accepting request 619362 from home:jmoellers:branches:Base:System OBS-URL: https://build.opensuse.org/request/show/619362 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=304 --- grub.default | 2 +- grub2.changes | 8 ++++++++ grub2.spec | 3 --- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/grub.default b/grub.default index 798fc4d..c75de63 100644 --- a/grub.default +++ b/grub.default @@ -33,7 +33,7 @@ GRUB_CMDLINE_LINUX="" #GRUB_DISABLE_LINUX_UUID=true # 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 #GRUB_INIT_TUNE="480 440 1" diff --git a/grub2.changes b/grub2.changes index 64b3a93..052ca26 100644 --- a/grub2.changes +++ b/grub2.changes @@ -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 diff --git a/grub2.spec b/grub2.spec index f389223..44726f0 100644 --- a/grub2.spec +++ b/grub2.spec @@ -852,9 +852,6 @@ perl -ni -e ' sub END() { 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} ) { $_ .= "GRUB_GFXPAYLOAD_LINUX=text\n"; }