From 739c16128f23cdd586ea3f6066916c443689e4ae Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 3 Jun 2005 04:16:28 +0000
Subject: create keyboard::configure_xorg() and use it (and don't call it
 inside a eval, no error should occur)

---
 perl-install/standalone/keyboarddrake | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'perl-install/standalone/keyboarddrake')

diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index d4bde7e10..167764c08 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -48,14 +48,7 @@ if (my ($kb) = grep { !/^-/ } @ARGV) {
 }
 
 keyboard::setxkbmap($keyboard);
-eval {
-    my $xfree_conf = Xconfig::xfree->read;
-    if (!is_empty_array_ref($xfree_conf)) {
-	my $xkb = keyboard::keyboard2full_xkb($keyboard);
-	$xfree_conf->set_keyboard($xkb);
-	$xfree_conf->write;
-    }
-};
+keyboard::configure_xorg($keyboard);
 
 keyboard::write($keyboard);
 system('/etc/init.d/keytable', 'restart');
-- 
cgit v1.2.1