diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-07-04 15:21:47 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-07-04 15:58:15 +0200 |
| commit | 2007ff340601ce140c91d25f344dd920267812d9 (patch) | |
| tree | 039faebef7a88c62c6e4a630fcffb7db1d75dba4 | |
| parent | 88cf1c412eb80c6f23252b6554a1ea73e9f145e3 (diff) | |
| download | drakx-2007ff340601ce140c91d25f344dd920267812d9.tar drakx-2007ff340601ce140c91d25f344dd920267812d9.tar.gz drakx-2007ff340601ce140c91d25f344dd920267812d9.tar.bz2 drakx-2007ff340601ce140c91d25f344dd920267812d9.tar.xz drakx-2007ff340601ce140c91d25f344dd920267812d9.zip | |
ensure we only offer lilo/grub choice on upgrades
| -rw-r--r-- | perl-install/bootloader.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 8d9f01eba..d6324a401 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1319,7 +1319,8 @@ sub method_choices_raw { if_(!$b_prefix_mounted || whereis_binary('grub2-reboot', $::prefix), 'grub2-graphic', 'grub2'), # only grub2 works on UEFI: - if_(!is_uefi(), ( + # lilo & grub-legacy do not suppport new ext4/xfs format and are unmainted so only allow them on upgrade: + if_(!is_uefi() && !($::isInstall && !$::o->{isUpgrade}), ( 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) && -f "$::prefix/etc/lilo.conf", diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a29d56209..4db5b2ea2 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - bootloader configuration: o make clear grub2 is installed on ESP under UEFI + o make sure we only offer lilo/grub choice on upgrades only Version 17.47 - 30 June 2016 |