From fa3972bfa63c74d238f91a9fc12ac7e37504413a Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Sun, 29 Apr 2012 22:59:37 +0000
Subject: 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)

---
 lib/Xconfig/various.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/Xconfig')

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;
 }
 
-- 
cgit v1.2.1