diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-05-29 15:38:07 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-05-29 15:38:07 +0000 |
| commit | 7885389849b5bfb61e96fa5b317c420d14ddb17c (patch) | |
| tree | 4de49eb4626e7570f0219e8de22ae90175c29977 /perl-install/standalone | |
| parent | c99cd6fecca05186cb1c5a29a4f1341a7281fd12 (diff) | |
| download | drakx-7885389849b5bfb61e96fa5b317c420d14ddb17c.tar drakx-7885389849b5bfb61e96fa5b317c420d14ddb17c.tar.gz drakx-7885389849b5bfb61e96fa5b317c420d14ddb17c.tar.bz2 drakx-7885389849b5bfb61e96fa5b317c420d14ddb17c.tar.xz drakx-7885389849b5bfb61e96fa5b317c420d14ddb17c.zip | |
splash mode needs reading bootloader config too
Diffstat (limited to 'perl-install/standalone')
| -rwxr-xr-x | perl-install/standalone/drakboot | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 75056571f..a7b253017 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -45,13 +45,17 @@ my $fstab = [ fs::get::fstab($all_hds) ]; my $cmdline = cat_('/proc/cmdline'); my $bootloader; -if (!$in->isa('interactive::gtk') || any { /^--boot$/ } @ARGV) { +my $is_bootloader_mode = !$in->isa('interactive::gtk') || any { /^--boot$/ } @ARGV; + +if ($is_bootloader_mode || any { /^--splash$/ } @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); } +} +if ($is_bootloader_mode) { $::isWizard = 1; eval { any::setupBootloaderUntilInstalled($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL}) }; die if $@ && $@ !~ /^wizcancel/; |