summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-20 17:24:00 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-20 17:24:00 +0200
commit0f32b38048f50cceed0f01b693086691909418ab (patch)
treec33737937f1c691ca732d2668624e7e680e48798
parentc9816a228f0898bbc82041f4ef7f0ced07d82d27 (diff)
downloaddrakx-0f32b38048f50cceed0f01b693086691909418ab.tar
drakx-0f32b38048f50cceed0f01b693086691909418ab.tar.gz
drakx-0f32b38048f50cceed0f01b693086691909418ab.tar.bz2
drakx-0f32b38048f50cceed0f01b693086691909418ab.tar.xz
drakx-0f32b38048f50cceed0f01b693086691909418ab.zip
ensure we've the right grub2 flavor (mga#18739)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm5
-rw-r--r--perl-install/install/NEWS2
3 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 8fdb461c3..ebb15f70d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o ensure we've the right grub2 flavor (mga#18739)
+
Version 17.39 - 18 June 2016
- diskdrake:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 446df0ade..24be5d821 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -2144,7 +2144,6 @@ sub install {
sub ensure_pkg_is_installed {
my ($do_pkgs, $bootloader) = @_;
- my %pkg = ('grub2' => is_uefi() ? 'grub2-efi' : 'grub2');
my %suppl = (
# method => [ 'pkg_name', 'file_to_test' ],
'grub-graphic' => [ qw(mageia-gfxboot-theme /usr/share/gfxboot/themes/Mageia/boot/message) ],
@@ -2152,7 +2151,9 @@ sub ensure_pkg_is_installed {
);
my $main_method = main_method($bootloader->{method});
if ($main_method eq 'grub2') {
- $do_pkgs->ensure_binary_is_installed($pkg{grub2}, 'grub2-install', 1) or return 0;
+ my $pkg = is_uefi() ? 'grub2-efi' : 'grub2';
+ my $prefix = is_uefi() ? 'efi' : 'pc';
+ $do_pkgs->ensure_is_installed($pkg, glob("/usr/lib/grub/*-$prefix/ext2.mod"), 1) or return 0;
} elsif (member($main_method, qw(grub grub2 lilo))) {
$do_pkgs->ensure_binary_is_installed($main_method, $main_method, 1) or return 0;
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 17968e6f0..b2fd611e7 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- bootloader:
+ o ensure we've the right grub2 flavor (mga#18739)
- no more include vmmouse driver
Version 17.39 - 18 June 2016