From b2ece6e1218b5d8b1bb19b7884d6ef5114f04f63 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 17 Jun 2004 07:53:41 +0000
Subject: fix applying keyboard configuration in globetrotter's first time
 wizard

---
 perl-install/install_gtk.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index c7086f915..dd5faef65 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -256,8 +256,7 @@ sub createXconf {
     symlink("/tmp/stage2/etc/X11", "/etc/X11");
 
 if ($Driver) {
-     output($file, sprintf(<<'END', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
-
+     output($file, sprintf(<<'END', ($::globetrotter ? "" : 'Option "XkbDisable"'), $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
 Section "Files"
    FontPath   "/usr/X11R6/lib/X11/fonts:unscaled"
 EndSection
@@ -265,7 +264,7 @@ EndSection
 Section "InputDevice"
     Identifier "Keyboard"
     Driver "Keyboard"
-    Option "XkbDisable"
+    %s
     Option "XkbModel" "pc105"
     Option "XkbLayout" ""
 EndSection
-- 
cgit v1.2.1