summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-22 11:09:46 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-22 11:09:46 +0000
commit864ae695ac0afaea3aae86dd8d21f2a21e779ee2 (patch)
tree855fe5626d3053ac6ab6999cecf8b4c64f91aba8
parent5b78417bb392b04b970c19a36e1a6b7431667d75 (diff)
downloaddrakx-864ae695ac0afaea3aae86dd8d21f2a21e779ee2.tar
drakx-864ae695ac0afaea3aae86dd8d21f2a21e779ee2.tar.gz
drakx-864ae695ac0afaea3aae86dd8d21f2a21e779ee2.tar.bz2
drakx-864ae695ac0afaea3aae86dd8d21f2a21e779ee2.tar.xz
drakx-864ae695ac0afaea3aae86dd8d21f2a21e779ee2.zip
(createXconf) split out mouse section (needed for next commit)
-rw-r--r--perl-install/install/gtk.pm20
1 files changed, 12 insertions, 8 deletions
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index 6aa6a8c95..5c723d05f 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -263,7 +263,17 @@ sub createXconf {
symlink("/tmp/stage2/etc/X11", "/etc/X11");
if ($Driver) {
- output($file, sprintf(<<'END', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
+ 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"'));
Section "ServerFlags"
Option "AutoAddDevices" "False"
EndSection
@@ -279,13 +289,7 @@ Section "InputDevice"
Option "XkbLayout" "us"
EndSection
-Section "InputDevice"
- Identifier "Mouse"
- Driver "mouse"
- Option "Protocol" "%s"
- Option "Device" "/dev/mouse"
- Option "ZAxisMapping" "4 5"
-EndSection
+%s
Section "Monitor"
Identifier "monitor"