diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-12-15 01:30:37 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-12-15 01:30:37 +0000 |
| commit | 7817670fda371068ac4f31db6a5289598ba033b1 (patch) | |
| tree | 3bc98ec448c043b4f97d082d4f8077f1a3427ea8 | |
| parent | c472a61e0c50e741bc4c98069f0ab1b12586ce4a (diff) | |
| download | drakx-7817670fda371068ac4f31db6a5289598ba033b1.tar drakx-7817670fda371068ac4f31db6a5289598ba033b1.tar.gz drakx-7817670fda371068ac4f31db6a5289598ba033b1.tar.bz2 drakx-7817670fda371068ac4f31db6a5289598ba033b1.tar.xz drakx-7817670fda371068ac4f31db6a5289598ba033b1.zip | |
fix checking grub2 installation (mga#8390)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 264adf5e3..3719eda64 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- fix checking grub2 installation (mga#8390) + Version 15.12 - 14 December 2012 - "enhance" fake grub2 conf reading (mga#8366) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 71fedd12a..dd0b25551 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -2034,9 +2034,10 @@ sub install { sub ensure_pkg_is_installed { my ($do_pkgs, $bootloader) = @_; + 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, $main_method, 1) or return 0; + $do_pkgs->ensure_binary_is_installed($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 26ceed4ec..aef80045f 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix checking grub2 installation (mga#8390) + Version 15.12 - 14 December 2012 - "enhance" fake grub2 conf reading (mga#8366) |