summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-22 12:34:04 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-22 12:34:04 +0000
commitf04690773fe230e3b8227d4c7b539915ac3f51fc (patch)
treec68797f8d524a8afefe0e662a5cc23516ba63d81 /perl-install/install
parent3acbab8b967f9e1f349458bf44730047cb37d597 (diff)
downloaddrakx-f04690773fe230e3b8227d4c7b539915ac3f51fc.tar
drakx-f04690773fe230e3b8227d4c7b539915ac3f51fc.tar.gz
drakx-f04690773fe230e3b8227d4c7b539915ac3f51fc.tar.bz2
drakx-f04690773fe230e3b8227d4c7b539915ac3f51fc.tar.xz
drakx-f04690773fe230e3b8227d4c7b539915ac3f51fc.zip
revert latest commit (uneeded)
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/gtk.pm20
1 files changed, 8 insertions, 12 deletions
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index 5c723d05f..6aa6a8c95 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -263,17 +263,7 @@ sub createXconf {
symlink("/tmp/stage2/etc/X11", "/etc/X11");
if ($Driver) {
- my $mouse_section = sprintf(<<'END', $mouse_type);
-Section "InputDevice"
- Identifier "Mouse"
- Driver "mouse"
- Option "Protocol" "%s"
- Option "Device" "/dev/mouse"
- Option "ZAxisMapping" "4 5"
-EndSection
-END
-
- output($file, sprintf(<<'END', $mouse_section, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
+ output($file, sprintf(<<'END', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
Section "ServerFlags"
Option "AutoAddDevices" "False"
EndSection
@@ -289,7 +279,13 @@ Section "InputDevice"
Option "XkbLayout" "us"
EndSection
-%s
+Section "InputDevice"
+ Identifier "Mouse"
+ Driver "mouse"
+ Option "Protocol" "%s"
+ Option "Device" "/dev/mouse"
+ Option "ZAxisMapping" "4 5"
+EndSection
Section "Monitor"
Identifier "monitor"