summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2012-04-29 22:59:37 +0000
committerPascal Terjan <pterjan@mageia.org>2012-04-29 22:59:37 +0000
commitfa3972bfa63c74d238f91a9fc12ac7e37504413a (patch)
tree981842745361bd0328456aa2545a4c680c21b355
parent3478cab6e0dbae41b8685d57ecb648efa843fe35 (diff)
downloaddrakx-kbd-mouse-x11-fa3972bfa63c74d238f91a9fc12ac7e37504413a.tar
drakx-kbd-mouse-x11-fa3972bfa63c74d238f91a9fc12ac7e37504413a.tar.gz
drakx-kbd-mouse-x11-fa3972bfa63c74d238f91a9fc12ac7e37504413a.tar.bz2
drakx-kbd-mouse-x11-fa3972bfa63c74d238f91a9fc12ac7e37504413a.tar.xz
drakx-kbd-mouse-x11-fa3972bfa63c74d238f91a9fc12ac7e37504413a.zip
Do not install bootloader when configuring X during install.
This will be done at end of summary to allow selecting where to install bootloader(mga#5044)
-rw-r--r--NEWS4
-rw-r--r--lib/Xconfig/various.pm10
2 files changed, 12 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 798df89..299f1e3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- do not install bootloader when configuring X during install.
+ this will be done at end of summary to allow selecting where
+ to install bootloader (mga#5044)
+
Version 0.101 - 05 April 2012
- fix crash introduced in 0.100 (mga#5238)
diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm
index 8d25375..2f93a75 100644
--- a/lib/Xconfig/various.pm
+++ b/lib/Xconfig/various.pm
@@ -380,8 +380,14 @@ sub change_bootloader_config {
$do->($bootloader, @do_params) or return;
- bootloader::action($bootloader, 'write', $all_hds);
- bootloader::action($bootloader, 'when_config_changed');
+ # Do not install bootloader when configuring X during install.
+ # This will be done at end of summary to allow selecting where
+ # to install bootloader.
+ unless ($::isInstall) {
+ bootloader::action($bootloader, 'write', $all_hds);
+ bootloader::action($bootloader, 'when_config_changed');
+ }
+
1;
}