summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk von Suchodoletz2010-08-09 14:36:48 +0200
committerDirk von Suchodoletz2010-08-09 14:36:48 +0200
commit607e3379d36d699883c31fc57d954f9d601f3084 (patch)
tree3ada52e5ce24360b30ce02c9ff86c6de577d83c8
parentMinor optimizations ... (diff)
downloadcore-607e3379d36d699883c31fc57d954f9d601f3084.tar.gz
core-607e3379d36d699883c31fc57d954f9d601f3084.tar.xz
core-607e3379d36d699883c31fc57d954f9d601f3084.zip
Fixing the double typo bug as reported in the mailinglist.
-rw-r--r--os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10.pm (renamed from os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm)8
-rw-r--r--os-plugins/plugins/xserver/XX_xserver.sh2
2 files changed, 6 insertions, 4 deletions
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10.pm
index f72ba877..f0c3ebb8 100644
--- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2008 - OpenSLX GmbH
+# Copyright (c) 2008..2010 - OpenSLX GmbH
#
# This program is free software distributed under the GPL version 2.
# See http://openslx.org/COPYING
@@ -8,11 +8,11 @@
#
# General information about OpenSLX can be found at http://openslx.org/
# -----------------------------------------------------------------------------
-# xserver/OpenSLX/Distro/Suse_10_2.pm
+# xserver/OpenSLX/Distro/Suse_10.pm
# - provides SUSE-specific overrides of the Distro API for the xserver
# plugin.
# -----------------------------------------------------------------------------
-package xserver::OpenSLX::Distro::Suse_10_2;
+package xserver::OpenSLX::Distro::Suse_10;
use strict;
use warnings;
@@ -41,6 +41,8 @@ sub setupXserverScript
testmkd /mnt/var/X11R6/bin
ln -s /usr/bin/Xorg /mnt/var/X11R6/bin/X
rm /mnt/etc/X11/xdm/SuSEconfig.xdm
+ # use the old kbd keyboard driver instead of evdev
+ sed "s/\"evdev\"/,/\"kbd\"/" -i ${xfc}
# relevant for older xservers only: check for kind of xorg module used
# and patch the i8,9XX VGA BIOS if needed
#if strinfile '"i810"' $xfc && [ -f /etc/hwinfo.display ] ; then
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index a2318c9f..1b757901 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -49,7 +49,7 @@ x_mouse='Section "InputDevice"
EndSection'
x_keyboard='Section "InputDevice"
Identifier "Generic Keyboard"
- Driver "kbd"
+ Driver "evdev"
Option "CoreKeyboard"
Option "XkbRules" "xorg"
Option "XkbModel" "pc105"