From df8433f2db7142b045a80391b74c21057a92b2d3 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 3 Apr 2015 18:17:58 +0200
Subject: split install_raw_grub2() out of install_grub2()

thus fixing grub2 rescue (mga#13408, mga#13901)
---
 perl-install/bootloader.pm | 7 ++++++-
 rescue/NEWS                | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

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";
diff --git a/rescue/NEWS b/rescue/NEWS
index cd61e23ee..abd9dd1ce 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,5 @@
+- fix grub2 rescue (mga#13408, mga#13901)
+
 Version 1.50 - 9 January 2015 by Thomas Backlund
 
 - add efibootmgr on x86_64
-- 
cgit v1.2.1