diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-20 17:19:04 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-20 17:19:04 +0200 |
| commit | 81d18422a6f5ce2649625fb684654dc1a76144a7 (patch) | |
| tree | 7d858e2f561cd7da36184b0716fb9c17366abc5f /perl-install | |
| parent | 2d01297a181e37b65027d9a22f0ae5306a8abac2 (diff) | |
| download | drakx-81d18422a6f5ce2649625fb684654dc1a76144a7.tar drakx-81d18422a6f5ce2649625fb684654dc1a76144a7.tar.gz drakx-81d18422a6f5ce2649625fb684654dc1a76144a7.tar.bz2 drakx-81d18422a6f5ce2649625fb684654dc1a76144a7.tar.xz drakx-81d18422a6f5ce2649625fb684654dc1a76144a7.zip | |
split out grub2 case for next commit
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/bootloader.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index faea83af0..23f3d26f3 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -2145,14 +2145,15 @@ sub ensure_pkg_is_installed { my ($do_pkgs, $bootloader) = @_; my %pkg = ('grub2' => is_uefi() ? 'grub2-efi' : 'grub2'); - my %h = ('grub2' => 'grub2-install'); my %suppl = ( # method => [ 'pkg_name', 'file_to_test' ], 'grub-graphic' => [ qw(mageia-gfxboot-theme /usr/share/gfxboot/themes/Mageia/boot/message) ], 'grub2-graphic' => [ qw(grub2-mageia-theme /boot/grub2/themes/maggy/theme.txt) ], ); my $main_method = main_method($bootloader->{method}); - if (member($main_method, qw(grub grub2 lilo))) { + if ($main_method eq 'grub2') { + $do_pkgs->ensure_binary_is_installed($pkg{grub2}, 'grub2-install', 1) or return 0; + } elsif (member($main_method, qw(grub grub2 lilo))) { $do_pkgs->ensure_binary_is_installed($pkg{$main_method} || $main_method, $h{$main_method} || $main_method, 1) or return 0; } # Install gfx theme if needed: |