summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/drakboot13
2 files changed, 10 insertions, 6 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ed5f6505c..6f7ed8557 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o only read bootloader configuration when configuring it
+ (usefull in chroots)
- draksound:
o be more robust when managing /etc/alsa/pulse-default.conf
- drakbug:
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index d00008ff1..75056571f 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -44,13 +44,14 @@ fs::get_info_from_fstab($all_hds);
my $fstab = [ fs::get::fstab($all_hds) ];
my $cmdline = cat_('/proc/cmdline');
-my $bootloader = bootloader::read($all_hds);
-if (!$bootloader) {
- $in->ask_okcancel('', N("No bootloader found, creating a new configuration"), 0) or $in->exit;
- any::setupBootloaderBeforeStandalone($in->do_pkgs, $bootloader ||= {}, $all_hds, $fstab);
-}
-
+my $bootloader;
if (!$in->isa('interactive::gtk') || any { /^--boot$/ } @ARGV) {
+ $bootloader = bootloader::read($all_hds);
+ if (!$bootloader) {
+ $in->ask_okcancel('', N("No bootloader found, creating a new configuration"), 0) or $in->exit;
+ any::setupBootloaderBeforeStandalone($in->do_pkgs, $bootloader ||= {}, $all_hds, $fstab);
+ }
+
$::isWizard = 1;
eval { any::setupBootloaderUntilInstalled($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL}) };
die if $@ && $@ !~ /^wizcancel/;