summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-04-03 18:17:58 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-04-03 18:17:58 +0200
commitdf8433f2db7142b045a80391b74c21057a92b2d3 (patch)
treef70599bdc9ad4c58ee6b51fbafce85153cf6c897 /perl-install
parentd2b7dfe393ffaea8b40212ad9cb4c3c9f0c4016d (diff)
downloaddrakx-df8433f2db7142b045a80391b74c21057a92b2d3.tar
drakx-df8433f2db7142b045a80391b74c21057a92b2d3.tar.gz
drakx-df8433f2db7142b045a80391b74c21057a92b2d3.tar.bz2
drakx-df8433f2db7142b045a80391b74c21057a92b2d3.tar.xz
drakx-df8433f2db7142b045a80391b74c21057a92b2d3.zip
split install_raw_grub2() out of install_grub2()
thus fixing grub2 rescue (mga#13408, mga#13901)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 6ea0c23d4..b33b7eed2 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1964,9 +1964,14 @@ sub restore_previous_MBR_bootloader {
sub install_grub2 {
my ($bootloader, $all_hds) = @_;
- my $error;
write_grub2($bootloader, $all_hds);
my $boot = $bootloader->{boot};
+ install_raw_grub2($boot);
+}
+
+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";