From 6a38c077285c88dcf4d042ec43b6803ba5c56cb1 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 8 Apr 2015 05:53:19 -0400 Subject: fix detecting grub2 on ESP We only support detecting grub2 on ESP for now. This might help mga#13901 fix: $ detectloader Cannot find a boot loader installed --- perl-install/NEWS | 3 +++ perl-install/bootloader.pm | 7 +++++++ perl-install/install/NEWS | 3 +++ 3 files changed, 13 insertions(+) diff --git a/perl-install/NEWS b/perl-install/NEWS index 36c5d5587..31df620e4 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- drakboot: + o fix detecting grub2 on UEFI + Version 16.79 - 7 April 2015 - drakboot: diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index d7bddcff2..fd59addb2 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -261,6 +261,13 @@ sub read { return $bootloader if read_($bootloader); } } + # still no boot loader found? let's check for ESP if using UEFI: + if (is_uefi()) { + if (-f "/boot/EFI/EFI/mageia/grubx64.efi") { + my $bootloader = bootloader::read_grub2(); + return $bootloader if read_($bootloader); + } + } } sub read_ { diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a36cebf09..7f4d375d2 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- bootloader config: + o fix detecting grub2 on UEFI + Version 16.79 - 7 April 2015 - bootloader config: -- cgit v1.2.1