From 47f3c781cf4bcdcedb0c76f101dcb41d38a86a20 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 27 Feb 2013 06:40:01 +0000 Subject: (install_grub2) always generate grub2 menu (like for other bootloaders) thus only one place where we actually issue the proper command --- perl-install/bootloader.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index d912a183f..ccea86a63 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1977,12 +1977,9 @@ sub restore_previous_MBR_bootloader { } sub install_grub2 { - my ($bootloader, $_all_hds) = @_; + my ($bootloader, $all_hds) = @_; my $error; - my $grub2_cfg = "/boot/grub2/grub.cfg"; - if (!-s "$::prefix/$grub2_cfg") { - run_program::rooted($::prefix, 'grub2-mkconfig', '2>', \$error, '-o', $grub2_cfg) or die "grub2-mkconfig failed: $error"; - } + write_grub2($bootloader, $all_hds); run_program::rooted($::prefix, 'grub2-install', '2>', \$error, $bootloader->{boot}) or die "grub2-install failed: $error"; setVarsInSh("$::prefix/boot/grub2/drakboot.conf", { boot => $bootloader->{boot} }); } -- cgit v1.2.1