From fa3972bfa63c74d238f91a9fc12ac7e37504413a Mon Sep 17 00:00:00 2001 From: Pascal Terjan 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) --- NEWS | 4 ++++ lib/Xconfig/various.pm | 10 ++++++++-- 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; } -- cgit v1.2.1