From cf1cbf14b0c673f6a0842244fb8fa3a941932247 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 5 Apr 2001 11:53:34 +0000
Subject: (configureXBefore): fix the xkb verification (was broken for things
 like ``de(nodeadkeys)'')

---
 perl-install/install_steps.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index e3a3cb625..c69c91a07 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -735,12 +735,11 @@ sub setupBootloader($) {
 sub configureXBefore {
     my ($o) = @_;
     my $xkb = $o->{X}{keyboard}{xkb_keymap} || keyboard::keyboard2xkb($o->{keyboard});
-    $xkb = '' if !($xkb && -e "$o->{prefix}/usr/X11R6/lib/X11/xkb/symbols/$xkb");
+    $xkb = '' if !($xkb && $xkb =~ /([^(]*)/ && -e "$o->{prefix}/usr/X11R6/lib/X11/xkb/symbols/$1");
     if (!$xkb && (my $f = keyboard::xmodmap_file($o->{keyboard}))) {
 	require commands;
 	commands::cp("-f", $f, "$o->{prefix}/etc/X11/xinit/Xmodmap");	
 	$xkb = '';
-
     }
     {
 	my $f = "$o->{prefix}/etc/sysconfig/i18n";
-- 
cgit v1.2.1