From b0039ed72e22303c213539ed68315fd90c3c73f1 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 3 Apr 2015 18:23:39 +0200 Subject: factorize command call (needed for next commit) --- 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 b33b7eed2..d85a02d39 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1973,11 +1973,8 @@ sub install_raw_grub2 { my ($boot) = @_; my $error; # 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 }); } -- cgit v1.2.1