Mageia Bugzilla – Attachment 8033 Details for
Bug 18739
drak-install fails on install from desktop (grub2-install failed: grub2-install: error: /usr/lib/grub/i386-pc/modinfo.sh doesn't exist)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
fix the grub2 post-install check (mga#18739)
0001-fix-the-grub2-post-install-check-mga-18739.patch (text/plain), 1.72 KB, created by
Thierry Vignaud
on 2016-06-20 22:54:22 CEST
(
hide
)
Description:
fix the grub2 post-install check (mga#18739)
Filename:
MIME Type:
Creator:
Thierry Vignaud
Created:
2016-06-20 22:54:22 CEST
Size:
1.72 KB
patch
obsolete
>From 2705d3eb575ca26b6f273ca744aba2085756171d Mon Sep 17 00:00:00 2001 >From: Thierry Vignaud <thierry.vignaud@gmail.com> >Date: Mon, 20 Jun 2016 22:53:03 +0200 >Subject: [PATCH] fix the grub2 post-install check (mga#18739) > >--- > perl-install/NEWS | 3 +++ > perl-install/bootloader.pm | 4 ++-- > perl-install/install/NEWS | 3 +++ > 3 files changed, 8 insertions(+), 2 deletions(-) > >diff --git a/perl-install/NEWS b/perl-install/NEWS >index 19102f7..3eeb315 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 f007741..cc530e9 100644 >--- a/perl-install/bootloader.pm >+++ b/perl-install/bootloader.pm >@@ -2161,8 +2161,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 861b73b..f6a1a87 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: >-- >2.5.5 >
From 2705d3eb575ca26b6f273ca744aba2085756171d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud <thierry.vignaud@gmail.com> Date: Mon, 20 Jun 2016 22:53:03 +0200 Subject: [PATCH] fix the grub2 post-install check (mga#18739) --- perl-install/NEWS | 3 +++ perl-install/bootloader.pm | 4 ++-- perl-install/install/NEWS | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 19102f7..3eeb315 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 f007741..cc530e9 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -2161,8 +2161,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 861b73b..f6a1a87 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: -- 2.5.5
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 18739
:
8029
|
8032
| 8033