diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-02-27 06:40:01 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-02-27 06:40:01 +0000 |
| commit | 428f0541d73eb55125d5436e3e4184d1079c6562 (patch) | |
| tree | 55baecbd61af4f4c565522e7e3e2cdacacf23e41 /perl-install | |
| parent | ca86281d3088a8db7043fe3568671d30f83db3b4 (diff) | |
| download | drakx-backup-do-not-use-428f0541d73eb55125d5436e3e4184d1079c6562.tar drakx-backup-do-not-use-428f0541d73eb55125d5436e3e4184d1079c6562.tar.gz drakx-backup-do-not-use-428f0541d73eb55125d5436e3e4184d1079c6562.tar.bz2 drakx-backup-do-not-use-428f0541d73eb55125d5436e3e4184d1079c6562.tar.xz drakx-backup-do-not-use-428f0541d73eb55125d5436e3e4184d1079c6562.zip | |
(install_grub2) always generate grub2 menu (like for other bootloaders)
thus only one place where we actually issue the proper command
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/bootloader.pm | 7 |
1 files 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} }); } |