From da79847ed2ce5d99b77c6e93313ab981a37b52aa Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 27 Nov 2007 12:01:20 +0000
Subject: - use xkb instead of xmodmap   (this fixes XF86_Switch_VT_X not
 defined in our xmodmaps)

=> stage2 is bigger: 640KB uncompressed, 223KB compressed
---
 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 37a95fa69..ba47a901b 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -245,7 +245,7 @@ sub createXconf {
     symlink("/tmp/stage2/etc/X11", "/etc/X11");
 
 if ($Driver) {
-     output($file, sprintf(<<'END', 'Option "XkbDisable"', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
+     output($file, sprintf(<<'END', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
 Section "Files"
    FontPath   "/usr/share/fonts:unscaled"
 EndSection
@@ -253,9 +253,8 @@ EndSection
 Section "InputDevice"
     Identifier "Keyboard"
     Driver "keyboard"
-    %s
     Option "XkbModel" "pc105"
-    Option "XkbLayout" ""
+    Option "XkbLayout" "us"
 EndSection
 
 Section "InputDevice"
-- 
cgit v1.2.1