diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-09-29 14:13:47 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-09-29 14:13:47 +0000 |
| commit | ec5cc80aff948eceee5b322bc19cf3e4e65a7c3a (patch) | |
| tree | b351a5b996899f440d24f6f04fab18f9d8a57efb /perl-install/install2.pm | |
| parent | 59d92e68854412a0ad81ec287e6c44a583bce140 (diff) | |
| download | drakx-backup-do-not-use-ec5cc80aff948eceee5b322bc19cf3e4e65a7c3a.tar drakx-backup-do-not-use-ec5cc80aff948eceee5b322bc19cf3e4e65a7c3a.tar.gz drakx-backup-do-not-use-ec5cc80aff948eceee5b322bc19cf3e4e65a7c3a.tar.bz2 drakx-backup-do-not-use-ec5cc80aff948eceee5b322bc19cf3e4e65a7c3a.tar.xz drakx-backup-do-not-use-ec5cc80aff948eceee5b322bc19cf3e4e65a7c3a.zip | |
no_comment
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index fd6aae4a6..b18895f3e 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -19,6 +19,7 @@ use keyboard; use lilo; use mouse; use fs; +use timezone; use fsedit; use devices; use partition_table qw(:types); @@ -52,7 +53,7 @@ my @installSteps = ( setRootPassword => [ __("Set root password"), 1, 1, "formatPartitions" ], addUser => [ __("Add a user"), 1, 1, "doInstallStep" ], createBootdisk => [ __("Create bootdisk"), 1, 0, "doInstallStep" ], - setupBootloader => [ __("Install bootloader"), 1, 1],#, "doInstallStep" ], + setupBootloader => [ __("Install bootloader"), 1, 1, "doInstallStep" ], configureX => [ __("Configure X"), 1, 0, "formatPartitions" ], exitInstall => [ __("Exit install"), 0, 0 ], ); @@ -326,7 +327,9 @@ sub selectInstallClass { $o->{partitions} ||= $suggestedPartitions{$o->{installClass}}; $o->{partitioning}{auto_allocate} ||= -1 if $::beginner; - $o->setPackages(\@install_classes) if $o->{steps}{choosePackages}{entered} >= 1; + $o->setPackages(\@install_classes) + if $o->{steps}{choosePackages}{entered} >= 1 && + !$o->{steps}{doInstallStep}{done}; } #------------------------------------------------------------------------------ |