diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2004-03-02 15:40:58 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2004-03-02 15:40:58 +0000 |
commit | 871db532fab936f7b931b0a3ea9fb177a277970c (patch) | |
tree | cb7cce190b520d37c19b0b648a1f0aea7e9f474a | |
parent | 354c739f97605b200be6f0c629ecbd3ed871cd64 (diff) | |
download | drakx-871db532fab936f7b931b0a3ea9fb177a277970c.tar drakx-871db532fab936f7b931b0a3ea9fb177a277970c.tar.gz drakx-871db532fab936f7b931b0a3ea9fb177a277970c.tar.bz2 drakx-871db532fab936f7b931b0a3ea9fb177a277970c.tar.xz drakx-871db532fab936f7b931b0a3ea9fb177a277970c.zip |
drakboot --boot is now a wizard
-rw-r--r-- | perl-install/any.pm | 11 | ||||
-rwxr-xr-x | perl-install/standalone/drakboot | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 4ca36a4e8..61075ed6d 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -89,10 +89,15 @@ sub setupBootloader { require bootloader; general: - setupBootloader__general($in, $b, $all_hds, $fstab, $security) or return 0; + { + local $::Wizard_no_previous = 1 if $::isStandalone; + setupBootloader__general($in, $b, $all_hds, $fstab, $security) or return 0; + } setupBootloader__boot_bios_drive($in, $b, $hds) or goto general; - - setupBootloader__entries($in, $b, $all_hds, $fstab) or goto general; + { + local $::Wizard_finished = 1 if $::isStandalone; + setupBootloader__entries($in, $b, $all_hds, $fstab) or goto general; + } #- somewhere should bootloader really installed ? $::isStandalone and my $_w = $in->wait_message(N("Please wait"), N("Bootloader installation in progress")); diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index e88f56ca4..7b26e0f1c 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -42,6 +42,7 @@ my $splash_working = any { /^--splash$/ } @ARGV; my $in = 'interactive'->vnew('su'); if (!$in->isa('interactive::gtk') || any { /^--boot$/ } @ARGV) { + $::isWizard = 1; lilo_choice(); $in->exit(0); } |