diff options
| author | Francois Pons <fpons@mandriva.com> | 1999-09-28 15:53:43 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 1999-09-28 15:53:43 +0000 |
| commit | 99c9b0680ce235c7e5bb6d18a8154a147e70947c (patch) | |
| tree | e42f58e16872cdf6f4030936f9050ebc5bb99b20 /perl-install/keyboard.pm | |
| parent | 4d1e2e9740a607609d497adf72dbef43e9f1a4c8 (diff) | |
| download | drakx-99c9b0680ce235c7e5bb6d18a8154a147e70947c.tar drakx-99c9b0680ce235c7e5bb6d18a8154a147e70947c.tar.gz drakx-99c9b0680ce235c7e5bb6d18a8154a147e70947c.tar.bz2 drakx-99c9b0680ce235c7e5bb6d18a8154a147e70947c.tar.xz drakx-99c9b0680ce235c7e5bb6d18a8154a147e70947c.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/keyboard.pm')
| -rw-r--r-- | perl-install/keyboard.pm | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 77322e803..9309d1a98 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -140,18 +140,10 @@ sub write($$) { } sub read($) { - my ($file) = @_; + my ($prefix) = @_; - local *F; - open F, "$file" or die "failed to read keyboard configuration"; - - foreach (<F>) { - ($_) = /^KEYTABLE=(.*)/ or log::l("unrecognized entry in keyboard configuration file ($_)"), next; - s/^\s*"(.*)"\s*$/$1/; - s/\.[^.]*//; #- remove extension - return basename($_); - } - die "empty keyboard configuration file"; + my %keyf = getVarsFromSh("$prefix/etc/sysconfig/keyboard"); + map { kmap($_) eq $keyf{KEYTABLE} ? $_ : (); } keys %keyboards; } #-###################################################################################### |