summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-06-24 10:15:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-06-24 10:15:52 +0000
commit2a0bbee296669686a3332e6595bc1021757249b0 (patch)
treef20cb8e3fe48e91f0184f16f4f773ba4b0dee9dc
parent13c1505ba44c0d57a4d5bdb6ce62267a34f9b510 (diff)
downloaddrakx-2a0bbee296669686a3332e6595bc1021757249b0.tar
drakx-2a0bbee296669686a3332e6595bc1021757249b0.tar.gz
drakx-2a0bbee296669686a3332e6595bc1021757249b0.tar.bz2
drakx-2a0bbee296669686a3332e6595bc1021757249b0.tar.xz
drakx-2a0bbee296669686a3332e6595bc1021757249b0.zip
no_comment
-rw-r--r--perl-install/install2.pm6
-rw-r--r--perl-install/keyboard.pm8
-rw-r--r--perl-install/lang.pm2
3 files changed, 10 insertions, 6 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index b1ec9847c..d2fd9d458 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -236,7 +236,7 @@ sub selectLanguage {
addToBeDone {
lang::write($o->{prefix});
- keyboard::write($o->{prefix}, $o->{keyboard});
+ keyboard::write($o->{prefix}, lang::lang2charset($o->{lang}), $o->{keyboard});
} 'doInstallStep' unless $::g_auto_install;
}
@@ -270,7 +270,7 @@ sub selectKeyboard {
#- if we go back to the selectKeyboard, you must rewrite
addToBeDone {
lang::write($o->{prefix});
- keyboard::write($o->{prefix}, $o->{keyboard});
+ keyboard::write($o->{prefix}, lang::lang2charset($o->{lang}), $o->{keyboard});
} 'doInstallStep' unless $::g_auto_install;
}
@@ -730,7 +730,7 @@ sub main {
-e "$o->{prefix}/usr/bin/urpmi" or eval { commands::rm("-rf", "$o->{prefix}/var/lib/urpmi") };
- #- have the really bleeding edge ddebug.log for this f*cking msec :-/
+ #- have the really bleeding edge ddebug.log
eval { commands::cp('-f', "/tmp/ddebug.log", "$o->{prefix}/root") };
#- ala pixel? :-) [fpons]
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 894adf130..6ece6b7c0 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -268,10 +268,12 @@ sub setup($) {
eval { run_program::run('xmodmap', $f) } unless $::testing || !$f;
}
-sub write($$;$) {
- my ($prefix, $keyboard, $isNotDelete) = @_;
+sub write($$$;$) {
+ my ($prefix, $keyboard, $charset, $isNotDelete) = @_;
- setVarsInSh("$prefix/etc/sysconfig/keyboard", { KEYTABLE => keyboard2kmap($keyboard), $isNotDelete ? () : (BACKSPACE => "Delete") });
+ setVarsInSh("$prefix/etc/sysconfig/keyboard", { KEYTABLE => keyboard2kmap($keyboard),
+ KBCHARSET => $charset,
+ $isNotDelete ? () : (BACKSPACE => "Delete") });
run_program::rooted($prefix, "dumpkeys > /etc/sysconfig/console/default.kmap") or log::l("dumpkeys failed");
}
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index f37f8389e..f072cd92b 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -210,6 +210,8 @@ sub text2lang {
die "unknown language $t";
}
+sub lang2charset { $languages{$_[0]} }
+
sub set {
my ($lang) = @_;