summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-20 22:53:03 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-20 23:03:41 +0200
commit60af921c04dda14b5a6f9cf8c134dda4a28448a6 (patch)
treeec606511cefd42b6d23fb09ba94939b5a64c89da
parent0dc4836b8b9a99796499836d7886cc583745f54c (diff)
downloaddrakx-60af921c04dda14b5a6f9cf8c134dda4a28448a6.tar
drakx-60af921c04dda14b5a6f9cf8c134dda4a28448a6.tar.gz
drakx-60af921c04dda14b5a6f9cf8c134dda4a28448a6.tar.bz2
drakx-60af921c04dda14b5a6f9cf8c134dda4a28448a6.tar.xz
drakx-60af921c04dda14b5a6f9cf8c134dda4a28448a6.zip
fix the grub2 post-install check (mga#18739)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm4
-rw-r--r--perl-install/install/NEWS3
3 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 19102f786..3eeb315be 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o fix the grub2 post-install check (mga#18739)
+
Version 17.40 - 20 June 2016
- drakboot:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index f9af5620f..60c3f01f1 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -2152,8 +2152,8 @@ sub ensure_pkg_is_installed {
my $main_method = main_method($bootloader->{method});
if ($main_method eq 'grub2') {
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;
+ my $prefix = is_uefi() ? (arch() eq 'x86_64' ? 'x86_64-efi' : 'i386-efi') : 'i386-pc';
+ $do_pkgs->ensure_is_installed($pkg, "/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 861b73b09..f6a1a8798 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- bootloader:
+ o fix the grub2 post-install check (mga#18739)
+
Version 17.40 - 20 June 2016
- bootloader: