summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-05-29 15:22:02 +0000
committerThierry Vignaud <tv@mandriva.org>2008-05-29 15:22:02 +0000
commitc99cd6fecca05186cb1c5a29a4f1341a7281fd12 (patch)
tree5e9e61c0f5dda8a754fd481afe441e5d09dfc3e5 /perl-install/standalone
parent939f7fd868a0a6313956624a528ae293571de5b6 (diff)
downloaddrakx-c99cd6fecca05186cb1c5a29a4f1341a7281fd12.tar
drakx-c99cd6fecca05186cb1c5a29a4f1341a7281fd12.tar.gz
drakx-c99cd6fecca05186cb1c5a29a4f1341a7281fd12.tar.bz2
drakx-c99cd6fecca05186cb1c5a29a4f1341a7281fd12.tar.xz
drakx-c99cd6fecca05186cb1c5a29a4f1341a7281fd12.zip
only read bootloader configuration when configuring it (usefull in chroots)
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/drakboot13
1 files changed, 7 insertions, 6 deletions
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/;