From e62c6c118959f8e43f0d9568c84c99416d33255d Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 3 Apr 2015 18:29:19 +0200
Subject: grub2-install output too (mga#15439)

It would help mga#15751 too
---
 perl-install/NEWS          | 2 ++
 perl-install/bootloader.pm | 5 ++++-
 perl-install/install/NEWS  | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1a21166a5..48cb47116 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- drakboot:
+  o log grub2-install failures (mga#15439)
 - diskdrake:
   o fix too wide buttons (mga#12422, mga#13471, mga#14839, mga#15379)
 
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 6f1644bed..d26120729 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -2023,7 +2023,10 @@ 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;
-    run_program::rooted($::prefix, 'grub2-install', '2>', \$error, '--grub-setup=/bin/true', @options) or die "grub2-install failed: $error";
+    if (!run_program::rooted($::prefix, 'grub2-install', '2>', \$error, '--grub-setup=/bin/true', @options)) {
+	log::explanations("grub2-install failed:\n(grub2-install @options)\nError: <$error>");
+	die "grub2-install failed: $error";
+    }
     setVarsInSh("$::prefix/boot/grub2/drakboot.conf", { boot => $boot });
 }
 
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index ab9f2b0a6..78ca394ed 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- bootloader config:
+  o log grub2-install failures (mga#15439)
 - partitioning:
   o fix too wide buttons (mga#12422, mga#13471, mga#14839, mga#15379)
 - Ensure uid/gid extraction works when adding users via summary page
-- 
cgit v1.2.1