diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-12-13 21:04:57 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-12-13 21:04:57 +0000 |
| commit | a48bd0adf52c429add460df4f751806c554bd012 (patch) | |
| tree | 630a1fd393c51dd77cd76f2c50a2dd711706bdc0 | |
| parent | 0d60b7c2896f57bcb63f5a31e8b1dd7c9fc716a3 (diff) | |
| download | drakx-a48bd0adf52c429add460df4f751806c554bd012.tar drakx-a48bd0adf52c429add460df4f751806c554bd012.tar.gz drakx-a48bd0adf52c429add460df4f751806c554bd012.tar.bz2 drakx-a48bd0adf52c429add460df4f751806c554bd012.tar.xz drakx-a48bd0adf52c429add460df4f751806c554bd012.zip | |
(ensure_pkg_is_installed) install grub2 if needed
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index f6f110220..126f060d8 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -2034,7 +2034,7 @@ sub ensure_pkg_is_installed { my ($do_pkgs, $bootloader) = @_; my $main_method = main_method($bootloader->{method}); - if ($main_method eq 'grub' || $main_method eq 'lilo') { + if (member($main_method, qw(grub grub2 lilo))) { $do_pkgs->ensure_binary_is_installed($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 920c652a6..5848bc38f 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- install grub2 if needed - media choice step: o display tooltips describing media |