summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-04-07 04:58:21 -0400
committerAnne Nicolas <ennael@mageia.org>2015-04-07 12:18:57 +0200
commita8702050b4b64fec08fba0a7e9495ad9e42561a3 (patch)
treeab2d6653e81b02802dff929a58f5d8a00bdb642b /perl-install
parentfc6d665a0159df241ea896a0f90bef3829d955b6 (diff)
downloaddrakx-a8702050b4b64fec08fba0a7e9495ad9e42561a3.tar
drakx-a8702050b4b64fec08fba0a7e9495ad9e42561a3.tar.gz
drakx-a8702050b4b64fec08fba0a7e9495ad9e42561a3.tar.bz2
drakx-a8702050b4b64fec08fba0a7e9495ad9e42561a3.tar.xz
drakx-a8702050b4b64fec08fba0a7e9495ad9e42561a3.zip
fix installing grub2 on MBR (mga#15640)
regression introduced in: commit b0039ed72e22303c213539ed68315fd90c3c73f1
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/install/NEWS4
3 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 15bf18a31..768db729d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- drakboot:
+ o fix installing grub2 on MBR (mga#15640)
+ (regression introduced in 16.76)
+
Version 16.77 - 7 April 2015
- bootloader:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 425036ba5..3dc05d779 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1975,7 +1975,7 @@ sub install_raw_grub2 {
my $error;
# if (member($boot, map { "/dev/$_->{device}" } @{$all_hds->{hds}}) {
my @options = $boot =~ /\d$/ ? ('--grub-setup=/bin/true', $boot) : $boot;
- if (!run_program::rooted($::prefix, 'grub2-install', '2>', \$error, '--grub-setup=/bin/true', @options)) {
+ if (!run_program::rooted($::prefix, 'grub2-install', '2>', \$error, @options)) {
log::explanations("grub2-install failed:\n(grub2-install @options)\nError: <$error>");
die "grub2-install failed: $error";
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 02d162aad..72a0c7355 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,7 @@
+- bootloader:
+ o fix installing grub2 on MBR (mga#15640)
+ (regression introduced in 16.76)
+
Version 16.77 - 7 April 2015
- bootloader: