summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-06 16:18:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-06 16:18:42 +0000
commit02c4150b64f6c76c8e5282b4ead401c05422bcba (patch)
tree5d16a81deb0c772df70790e85f84b7031514a83e /perl-install/install_steps.pm
parent4967f59d7ab44e955a12ecb9d9797d04c02fccc6 (diff)
downloaddrakx-02c4150b64f6c76c8e5282b4ead401c05422bcba.tar
drakx-02c4150b64f6c76c8e5282b4ead401c05422bcba.tar.gz
drakx-02c4150b64f6c76c8e5282b4ead401c05422bcba.tar.bz2
drakx-02c4150b64f6c76c8e5282b4ead401c05422bcba.tar.xz
drakx-02c4150b64f6c76c8e5282b4ead401c05422bcba.zip
fix keyboard config + some cleanup
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm14
1 files changed, 8 insertions, 6 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 690678002..43e7aaf65 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -93,20 +93,22 @@ sub selectLanguage {
if ($o->{keyboard_unsafe} || !$o->{keyboard}) {
$o->{keyboard_unsafe} = 1;
$o->{keyboard} = keyboard::lang2keyboard($o->{lang});
- selectKeyboard($o) if !$::live;
+ keyboard::setup($o->{keyboard}) if !$::live;
}
+
+ addToBeDone {
+ lang::write_langs($o->{prefix}, $o->{langs});
+ } 'formatPartitions' unless $::g_auto_install;
+ addToBeDone {
+ lang::write($o->{prefix}, $o->{lang});
+ } 'installPackages' unless $::g_auto_install;
}
#------------------------------------------------------------------------------
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;
}