From f19c03161a5a1a3030805b9b88323f40187f13b1 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 21 Jun 2020 15:28:38 +0100
Subject: Detect GRUB2 bootloader when installed in \EFI\BOOT.

---
 perl-install/bootloader.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install/bootloader.pm')

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 {
 		    ()
-- 
cgit v1.2.1