diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-02-24 20:52:07 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-02-24 20:52:07 +0000 |
| commit | 6c301e1487a9a0130a6081fdb4f9b16cf7cf16a2 (patch) | |
| tree | e6880b40b8b1ee07b97e8d884fdf3cae49ea4ff2 | |
| parent | 4be5d16f8505e1b1938b37b7427890ab96bc67eb (diff) | |
| download | drakx-backup-do-not-use-6c301e1487a9a0130a6081fdb4f9b16cf7cf16a2.tar drakx-backup-do-not-use-6c301e1487a9a0130a6081fdb4f9b16cf7cf16a2.tar.gz drakx-backup-do-not-use-6c301e1487a9a0130a6081fdb4f9b16cf7cf16a2.tar.bz2 drakx-backup-do-not-use-6c301e1487a9a0130a6081fdb4f9b16cf7cf16a2.tar.xz drakx-backup-do-not-use-6c301e1487a9a0130a6081fdb4f9b16cf7cf16a2.zip | |
move writing to config files from install2::selectKeyboard to install_steps
| -rw-r--r-- | perl-install/install2.pm | 9 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 741ff15b8..c168b7299 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -172,15 +172,6 @@ sub selectKeyboard { return if !$::expert && !$clicked; $o->selectKeyboard($clicked); - - #- if we go back to the selectKeyboard, you must rewrite - addToBeDone { - lang::write_langs($o->{prefix}, $o->{langs}); - } 'formatPartitions' unless $::g_auto_install; - addToBeDone { - lang::write($o->{prefix}, $o->{lang}); - keyboard::write($o->{prefix}, $o->{keyboard}, lang::lang2charset($o->{lang})); - } 'installPackages' unless $::g_auto_install; } #------------------------------------------------------------------------------ diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index c2dd27108..6d1f1093e 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -101,6 +101,15 @@ sub selectLanguage { sub selectKeyboard { my ($o) = @_; keyboard::setup($o->{keyboard}); + + #- if we go back to the selectKeyboard, you must rewrite + addToBeDone { + lang::write_langs($o->{prefix}, $o->{langs}); + } 'formatPartitions' unless $::g_auto_install; + addToBeDone { + lang::write($o->{prefix}, $o->{lang}); + keyboard::write($o->{prefix}, $o->{keyboard}, lang::lang2charset($o->{lang})); + } 'installPackages' unless $::g_auto_install; } #------------------------------------------------------------------------------ sub selectPath {} |