summaryrefslogtreecommitdiffstats
path: root/perl-install/install_gtk.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-06-18 04:23:04 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-06-18 04:23:04 +0000
commitb47c58af1703e7d851e0d7b489a70bff15d5f28d (patch)
tree4cc44ec7a82bdaca45a1368a58d57c16d2830867 /perl-install/install_gtk.pm
parent73dfbe7f701bf6efb3583efbe74be1b23cad4578 (diff)
downloaddrakx-b47c58af1703e7d851e0d7b489a70bff15d5f28d.tar
drakx-b47c58af1703e7d851e0d7b489a70bff15d5f28d.tar.gz
drakx-b47c58af1703e7d851e0d7b489a70bff15d5f28d.tar.bz2
drakx-b47c58af1703e7d851e0d7b489a70bff15d5f28d.tar.xz
drakx-b47c58af1703e7d851e0d7b489a70bff15d5f28d.zip
merge globetrotter support from MDK-10-branch
Diffstat (limited to 'perl-install/install_gtk.pm')
-rw-r--r--perl-install/install_gtk.pm5
1 files changed, 2 insertions, 3 deletions
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