summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-12-08 18:37:24 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-12-08 18:37:24 +0000
commit4ee38561c97468ef5c99ed329d70a7331332059f (patch)
tree71d427092c77786a1781de8f0530986370d3d2fb /perl-install
parent45f4d1189846e2e447edcbabd262f768e9e66ac8 (diff)
downloaddrakx-4ee38561c97468ef5c99ed329d70a7331332059f.tar
drakx-4ee38561c97468ef5c99ed329d70a7331332059f.tar.gz
drakx-4ee38561c97468ef5c99ed329d70a7331332059f.tar.bz2
drakx-4ee38561c97468ef5c99ed329d70a7331332059f.tar.xz
drakx-4ee38561c97468ef5c99ed329d70a7331332059f.zip
bootloader: only prefer rEFInd if it installed in the root fs (mga#23944)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 8e7dfc310..121f45bb0 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- drakboot: only prefer rEFInd if it installed in the root fs (mga#23944)
- desktop kernels are now PAE, for PTI security fixes to work properly,
so if cpu is not supporting it, install the desktop586 kernel
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 71d50eaa6..9b8372522 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1469,7 +1469,7 @@ sub method_choices_raw {
arch() =~ /arm/ ? 'uboot' :
if_(!$b_prefix_mounted || whereis_binary('grub2-reboot', $::prefix),
'grub2-graphic', 'grub2'),
- if_(is_uefi() && (!$b_prefix_mounted || -e "$::prefix/boot/EFI/EFI/refind"), 'refind'),
+ if_(is_uefi() && (!$b_prefix_mounted || whereis_binary('refind-install', $::prefix)), 'refind'),
# only grub2 & rEFInd work on 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} || $::isLiveInstall), (
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9a220a1e7..617526315 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- bootloader: only prefer rEFInd if it installed in the root fs (mga#23944)
+
Version 18.8.1 - 1 Dec 2018
- desktop kernels are now PAE, for PTI security fixes to work properly,