summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-04-13 08:35:56 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-04-13 17:46:15 +0200
commit722ad19a2716ce13de4fe46cac1dccf4935afafc (patch)
tree105309b8125e64642da00aeddb63256c352b9c36
parentbc2512a57d9bd7582561bced8999faffc2987d8c (diff)
downloaddrakx-722ad19a2716ce13de4fe46cac1dccf4935afafc.tar
drakx-722ad19a2716ce13de4fe46cac1dccf4935afafc.tar.gz
drakx-722ad19a2716ce13de4fe46cac1dccf4935afafc.tar.bz2
drakx-722ad19a2716ce13de4fe46cac1dccf4935afafc.tar.xz
drakx-722ad19a2716ce13de4fe46cac1dccf4935afafc.zip
do generate 'failsafe' entry for grub2 (mga#15675)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm1
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index fe82f4fcb..d9848c1ed 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,8 @@
o detect Lenovo recovery & 'SYSTEM_DRV' as such (mga#1371)
o do add a ESP if it was removed by "Clear All"
o ignore ESP for "use free space on MS"
+- drakboot:
+ o default to GRUB_DISABLE_RECOVERY=falss for 'failsafe' entry (mga#15675)
Version 16.81 - 12 April 2015
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index adb64c963..ebfc89fb2 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1792,6 +1792,7 @@ sub write_grub2 {
my $f = "$::prefix/etc/default/grub";
my %conf = getVarsFromSh($f);
$conf{GRUB_CMDLINE_LINUX_DEFAULT} = $append;
+ $conf{GRUB_DISABLE_RECOVERY} = 'false'; # for 'failsafe' entry
$conf{GRUB_TIMEOUT} = $bootloader->{timeout};
setVarsInSh($f, \%conf);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e1150a939..57954405c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,8 @@
o detect Lenovo recovery & 'SYSTEM_DRV' as such (mga#1371)
o do add a ESP if it was removed by "Clear All"
o ignore ESP for "use free space on MS"
+- bootloader config:
+ o default to GRUB_DISABLE_RECOVERY=falss for 'failsafe' entry (mga#15675)
Version 16.81 - 12 April 2015