From 7885389849b5bfb61e96fa5b317c420d14ddb17c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 29 May 2008 15:38:07 +0000
Subject: splash mode needs reading bootloader config too

---
 perl-install/standalone/drakboot | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'perl-install/standalone/drakboot')

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