diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-04-08 05:53:19 -0400 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-04-08 06:00:07 -0400 |
| commit | 6a38c077285c88dcf4d042ec43b6803ba5c56cb1 (patch) | |
| tree | 43e25717219573ebd8ca5e0c0bb5a757daa506ff | |
| parent | 4d98e868789d968376aad07e5d255c7d5af417a3 (diff) | |
| download | drakx-6a38c077285c88dcf4d042ec43b6803ba5c56cb1.tar drakx-6a38c077285c88dcf4d042ec43b6803ba5c56cb1.tar.gz drakx-6a38c077285c88dcf4d042ec43b6803ba5c56cb1.tar.bz2 drakx-6a38c077285c88dcf4d042ec43b6803ba5c56cb1.tar.xz drakx-6a38c077285c88dcf4d042ec43b6803ba5c56cb1.zip | |
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
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 7 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 13 insertions, 0 deletions
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: |