From 99c9b0680ce235c7e5bb6d18a8154a147e70947c Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 28 Sep 1999 15:53:43 +0000
Subject: *** empty log message ***

---
 perl-install/keyboard.pm | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'perl-install/keyboard.pm')

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;
 }
 
 #-######################################################################################
-- 
cgit v1.2.1