summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-04 15:10:12 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-06 10:35:57 +0200
commit6a805889e8d177cee40a4b435195eb56233aa87a (patch)
treedcdb01621a5a3d940750ebb87424334faad3b96d /perl-install
parent2c0ac3014f2255960461a61039b6139cb9462fa0 (diff)
downloaddrakx-6a805889e8d177cee40a4b435195eb56233aa87a.tar
drakx-6a805889e8d177cee40a4b435195eb56233aa87a.tar.gz
drakx-6a805889e8d177cee40a4b435195eb56233aa87a.tar.bz2
drakx-6a805889e8d177cee40a4b435195eb56233aa87a.tar.xz
drakx-6a805889e8d177cee40a4b435195eb56233aa87a.zip
stop offering grub legacy & lilo on new installs
rationale: - lilo is no more supported upstream and has been replaced by grub legacy a long time ago - grub-legacy does not support ext4 fses formatted with e2fsprogs-1.43 (mga#18583)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm4
-rw-r--r--perl-install/install/NEWS1
3 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 363a996f0..42f7f8742 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- drakboot:
o only overwrite GRUB_CMDLINE_LINUX_DEFAULT on first install (mga#18112)
o set GRUB_DEFAULT + GRUB_SAVEDEFAULT (mga#9627, mga#16059)
+ o stop offering grub legacy & lilo on new installs (mga#18583)
- running commands as user:
o fix the fallback when the helper didn't provide the real UID (mga#18288)
o guess the right user after the switch to polkit (mga#18288)
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 4d81cb88f..483f67d1c 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1287,9 +1287,9 @@ sub method_choices_raw {
if_(!$b_prefix_mounted || whereis_binary('grub2-reboot', $::prefix),
'grub2-graphic', 'grub2'),
if_(!is_uefi(), (
- if_(!$b_prefix_mounted || whereis_binary('grub', $::prefix),
+ if_(!$b_prefix_mounted || whereis_binary('grub', $::prefix) && -f "$::prefix/boot/grub/install.sh",
'grub-graphic', 'grub-menu'),
- if_(!$b_prefix_mounted || whereis_binary('lilo', $::prefix),
+ if_(!$b_prefix_mounted || whereis_binary('lilo', $::prefix) && -f "$::prefix/etc/lilo.conf",
'lilo-menu'),
));
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 439aef944..575432138 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- bootloader:
o only overwrite GRUB_CMDLINE_LINUX_DEFAULT on first install (mga#18112)
o set GRUB_DEFAULT + GRUB_SAVEDEFAULT (mga#9627, mga#16059)
+ o stop offering grub legacy & lilo on new installs (mga#18583)
Version 17.33 - 27 May 2016