summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-04-07 04:58:21 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-04-27 17:56:11 +0200
commit7189033dc6e885f0aa29a4befadc824b3e82e8b4 (patch)
tree933e026fcecfe39cec75778b67f1792473049938
parente62c6c118959f8e43f0d9568c84c99416d33255d (diff)
downloaddrakx-7189033dc6e885f0aa29a4befadc824b3e82e8b4.tar
drakx-7189033dc6e885f0aa29a4befadc824b3e82e8b4.tar.gz
drakx-7189033dc6e885f0aa29a4befadc824b3e82e8b4.tar.bz2
drakx-7189033dc6e885f0aa29a4befadc824b3e82e8b4.tar.xz
drakx-7189033dc6e885f0aa29a4befadc824b3e82e8b4.zip
fix installing grub2 on MBR (mga#15640)
regression introduced in: commit b0039ed72e22303c213539ed68315fd90c3c73f1
-rw-r--r--perl-install/bootloader.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index d26120729..f162b0d6d 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -2023,7 +2023,7 @@ sub install_grub2 {
my $boot = $bootloader->{boot};
# if (member($boot, map { "/dev/$_->{device}" } @{$all_hds->{hds}}) {
my @options = $boot =~ /\d$/ ? ('--grub-setup=/bin/true', $boot) : $boot;
- if (!run_program::rooted($::prefix, 'grub2-install', '2>', \$error, '--grub-setup=/bin/true', @options)) {
+ if (!run_program::rooted($::prefix, 'grub2-install', '2>', \$error, @options)) {
log::explanations("grub2-install failed:\n(grub2-install @options)\nError: <$error>");
die "grub2-install failed: $error";
}