summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-06-21 15:28:38 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-06-21 16:12:48 +0100
commitf19c03161a5a1a3030805b9b88323f40187f13b1 (patch)
tree26d7cd885649c3e19dd1200064cc4fd8b7590f5a
parent0baa58de6ff2b3ea3ebe6e09035a9643af4e0768 (diff)
downloaddrakx-f19c03161a5a1a3030805b9b88323f40187f13b1.tar
drakx-f19c03161a5a1a3030805b9b88323f40187f13b1.tar.gz
drakx-f19c03161a5a1a3030805b9b88323f40187f13b1.tar.bz2
drakx-f19c03161a5a1a3030805b9b88323f40187f13b1.tar.xz
drakx-f19c03161a5a1a3030805b9b88323f40187f13b1.zip
Detect GRUB2 bootloader when installed in \EFI\BOOT.
-rw-r--r--perl-install/bootloader.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 4e8fba097..227c5604b 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -301,7 +301,8 @@ sub read {
if (is_uefi()) {
if (-e "$::prefix/boot/refind_linux.conf") {
'refind';
- } elsif (-f "$::prefix/boot/EFI/EFI/mageia/grub" . uefi_type() . ".efi") {
+ } elsif (-f "$::prefix/boot/EFI/EFI/mageia/grub" . uefi_type() . ".efi" ||
+ $main_method eq 'grub2' && $bootloader->{removable} && -f "$::prefix/boot/EFI/EFI/BOOT/BOOT" . uc(uefi_type()) . ".EFI") {
'grub2';
} else {
()