From c3bf55979df2978ff72d1d2e31b712665b8b2ed8 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Wed, 27 Feb 2013 17:44:16 +0000
Subject: fix installing grub2 on a partition (mga#8462)

---
 perl-install/NEWS          | 3 +++
 perl-install/bootloader.pm | 7 ++++++-
 perl-install/install/NEWS  | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index c2a725d3d..2728b132e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+  o allow installing grub2 on a partition (mga#8462)
+
 Version 15.23 - 27 February 2013
 
 - drakboot:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 5c89d055b..2512842a2 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -2009,7 +2009,12 @@ sub install_grub2 {
     my $error;
     write_grub2($bootloader, $all_hds);
     my $boot = $bootloader->{boot}
-    run_program::rooted($::prefix, 'grub2-install', '2>', \$error, $boot) or die "grub2-install failed: $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";
+    }
     setVarsInSh("$::prefix/boot/grub2/drakboot.conf", { boot => $boot });
 }
 
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 91f2c5774..7c0aaac2e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- bootloader:
+  o allow installing grub2 on a partition (mga#8462)
+
 Version 15.23 - 27 February 2013
 
 - bootloader:
-- 
cgit v1.2.1