summaryrefslogtreecommitdiffstats
path: root/perl-install/keyboard.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-31 18:28:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-31 18:28:00 +0000
commit4fb58f50234c507d82cea15e3708e1b4d1584503 (patch)
treeed48615b9dc74fe1ed6504b701376d93847e1de7 /perl-install/keyboard.pm
parente49ef06e94b9c3846ab6c4bd50afcb5d77597720 (diff)
downloaddrakx-4fb58f50234c507d82cea15e3708e1b4d1584503.tar
drakx-4fb58f50234c507d82cea15e3708e1b4d1584503.tar.gz
drakx-4fb58f50234c507d82cea15e3708e1b4d1584503.tar.bz2
drakx-4fb58f50234c507d82cea15e3708e1b4d1584503.tar.xz
drakx-4fb58f50234c507d82cea15e3708e1b4d1584503.zip
no_comment
Diffstat (limited to 'perl-install/keyboard.pm')
-rw-r--r--perl-install/keyboard.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 1aacbbd8b..7cce0d1ff 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -285,9 +285,10 @@ sub write {
sub read {
my ($prefix) = @_;
-
my %keyf = getVarsFromSh("$prefix/etc/sysconfig/keyboard");
- map { keyboard2kmap($_) eq $keyf{KEYTABLE} || $_ eq $keyf{KEYTABLE} ? $_ : (); } keys %keyboards;
+ my $keytable = $keyf{KEYTABLE};
+ keyboard2kmap($_) eq $keytable and return $_ foreach keys %keyboards;
+ $keyboards{$keytable} ? $keytable : 'us_intl';
}
#-######################################################################################