From e4219ae4165122c8fce9380cbf99363454b4586b Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 19 Dec 2020 21:05:47 +0000
Subject: Fix false detection of GRUB2 when installed in ESP but not in /boot.

This caused the installer to select non-graphical GRUB2 as the default
bootloader method (mga#27816).
---
 perl-install/bootloader.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index c09b12330..d4533da39 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -360,7 +360,7 @@ Read back GRUB2 config
 =cut
 
 sub read_grub2() {
-    my %bootloader = read_grub2_install_sh();
+    my %bootloader = read_grub2_install_sh() if -e get_grub2_install_sh();
     return if is_empty_hash_ref(\%bootloader) & !-s "$::prefix/boot/grub2/grub.cfg";
     my %h = getVarsFromSh("$::prefix/etc/default/grub");
     $bootloader{timeout} = $h{GRUB_TIMEOUT};
-- 
cgit v1.2.1