summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/bootloader.pm7
1 files changed, 2 insertions, 5 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index dea5bf0bd..6f1644bed 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -2022,11 +2022,8 @@ sub install_grub2 {
write_grub2($bootloader, $all_hds);
my $boot = $bootloader->{boot};
# if (member($boot, map { "/dev/$_->{device}" } @{$all_hds->{hds}}) {
- if ($boot =~ /\d$/) {
- run_program::rooted($::prefix, 'grub2-install', '2>', \$error, '--grub-setup=/bin/true', $boot) or die "grub2-install failed: $error";
- } else {
- run_program::rooted($::prefix, 'grub2-install', '2>', \$error, $boot) or die "grub2-install failed: $error";
- }
+ my @options = $boot =~ /\d$/ ? ('--grub-setup=/bin/true', $boot) : $boot;
+ run_program::rooted($::prefix, 'grub2-install', '2>', \$error, '--grub-setup=/bin/true', @options) or die "grub2-install failed: $error";
setVarsInSh("$::prefix/boot/grub2/drakboot.conf", { boot => $boot });
}