From 6a805889e8d177cee40a4b435195eb56233aa87a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 4 Jun 2016 15:10:12 +0200 Subject: 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) --- perl-install/NEWS | 1 + perl-install/bootloader.pm | 4 ++-- perl-install/install/NEWS | 1 + 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 -- cgit v1.2.1