summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-12 05:51:12 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-12 05:51:12 +0000
commit57772e6a84ed2a79b4e19f8d1fc7dd5c9fbcd429 (patch)
tree6089faf6a189fe6e6a5271b97a49780b297f6249
parent3161ff3799fd6785052c68fdf61f4b66b0958d73 (diff)
downloaddrakx-57772e6a84ed2a79b4e19f8d1fc7dd5c9fbcd429.tar
drakx-57772e6a84ed2a79b4e19f8d1fc7dd5c9fbcd429.tar.gz
drakx-57772e6a84ed2a79b4e19f8d1fc7dd5c9fbcd429.tar.bz2
drakx-57772e6a84ed2a79b4e19f8d1fc7dd5c9fbcd429.tar.xz
drakx-57772e6a84ed2a79b4e19f8d1fc7dd5c9fbcd429.zip
install grub2-efi instead of grub2 if using UEFI (mga#8886)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm3
-rw-r--r--perl-install/install/NEWS2
3 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e867382e9..6d61656b8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o install grub2-efi instead of grub2 if using UEFI (mga#8886)
+
Version 15.26 - 5 March 2013
- include display_installer_help
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 7c372da27..360f20c0f 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -2085,10 +2085,11 @@ sub install {
sub ensure_pkg_is_installed {
my ($do_pkgs, $bootloader) = @_;
+ my %pkg = ('grub2' => glob_("/sys/firmware/efi/*") ? 'grub2-efi' : 'grub2');
my %h = ('grub2' => 'grub2-install');
my $main_method = main_method($bootloader->{method});
if (member($main_method, qw(grub grub2 lilo))) {
- $do_pkgs->ensure_binary_is_installed($main_method, $h{$main_method} || $main_method, 1) or return 0;
+ $do_pkgs->ensure_binary_is_installed($pkg{$main_method} || $main_method, $h{$main_method} || $main_method, 1) or return 0;
if ($bootloader->{method} eq 'grub-graphic') {
$do_pkgs->ensure_is_installed('mageia-gfxboot-theme', '/usr/share/gfxboot/themes/Mageia/boot/message', 1) or return 0;
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 8397cfd9e..225548385 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- bootloader:
+ o install grub2-efi instead of grub2 if using UEFI (mga#8886)
- fix dialogs popup with drakx-in-chroot
Version 15.26 - 5 March 2013