diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-08-30 22:32:42 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-08-30 22:32:42 +0000 |
| commit | 0ed259c5a608e956c9ccfac2845413a6e688d11f (patch) | |
| tree | 85db0899993a141f8ca805c4b7d82623dad65fd7 /perl-install/install2.pm | |
| parent | 1defcba73b989b6a28826c563417a7c0fc251052 (diff) | |
| download | drakx-0ed259c5a608e956c9ccfac2845413a6e688d11f.tar drakx-0ed259c5a608e956c9ccfac2845413a6e688d11f.tar.gz drakx-0ed259c5a608e956c9ccfac2845413a6e688d11f.tar.bz2 drakx-0ed259c5a608e956c9ccfac2845413a6e688d11f.tar.xz drakx-0ed259c5a608e956c9ccfac2845413a6e688d11f.zip | |
no_comment
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 7937251b5..78262ff35 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -165,7 +165,8 @@ my @installSteps = ( selectLanguage => [ __("Choose your language"), 1, 1 ], selectPath => [ __("Choose install or upgrade"), 0, 0 ], selectInstallClass => [ __("Select installation class"), 1, 1, "selectPath" ], - setupModules => [ __("Setup SCSI"), 1, 0 ], + selectKeyboard => [ __("Choose your keyboard"), 1, 1 ], + setupSCSI => [ __("Setup SCSI"), 1, 0 ], partitionDisks => [ __("Setup filesystems"), 1, 0 ], formatPartitions => [ __("Format partitions"), 1, -1, "partitionDisks" ], choosePackages => [ __("Choose packages to install"), 1, 1, "selectInstallClass" ], @@ -251,12 +252,16 @@ sub selectLanguage { keyboard::write($o->{prefix}, $o->{keyboard}); } } 'doInstallStep'; - - goto &selectKeyboard if $_[0]; } sub selectKeyboard { + return if $o->{installClass} eq "beginner" && !$_[0]; + $o->{keyboard} = keyboard::setup($o->chooseKeyboard); + + addToBeDone { + keyboard::write($o->{prefix}, $o->{keyboard}) unless $o->{isUpgrade}; + } 'doInstallStep'; } sub selectPath { |