9 files changed, 52 insertions, 14 deletions
diff --git a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
index 697d4184..ec58d132 100644
--- a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
+++ b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2007 - OpenSLX GmbH
+# Copyright (c) 2007..2010 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -107,9 +107,9 @@ sub suggestAdditionalKernelModules
     my @suggestedModules;
     
     # Ubuntu needs vesafb and fbcon (which drags along some others)
-    if ($makeInitRamFSEngine->{'distro-name'} =~ m{^ubuntu}i) {
-        push @suggestedModules, qw( vesafb fbcon )
-    }
+    #if ($makeInitRamFSEngine->{'distro-name'} =~ m{^ubuntu}i) {
+    push @suggestedModules, qw( i810 i830 i915 mga nouveau r128 radeon savage sis tdfx ttm via drm fbcon vesafb );
+    #}
     
     return @suggestedModules;
 }
diff --git a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh
index 24bdcba4..a54fde96 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh
@@ -1,6 +1,6 @@
 # splashy depends on /proc/fb with VESA
 # only activate with kernel option quiet and no debuglevel
-if grep -E "(VESA|VGA)" /proc/fb > /dev/null 2>&1 \
+if grep -q ".*" /proc/fb > /dev/null 2>&1 \
   && grep -qie " quiet " -qie "^quiet " -qie " quiet$" /proc/cmdline \
     > /dev/null 2>&1 \
   && [ $DEBUGLEVEL -eq 0 ] \
@@ -15,3 +15,4 @@ if [ ${no_bootsplash} -eq 0 ]; then
   # add splashy.boot runlevel script
   export D_SPLASHY=splashy.boot
 fi
+
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
index e6d9a819..96c8c89d 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
@@ -48,9 +48,9 @@ sub getDefaultDesktopManager
 {
     my $self = shift;
     
-    # the default implementation prefers GDM over KDM over XDM
-    return $self->isGDMInstalled() ? 'gdm' 
-        : $self->isKDMInstalled() ? 'kdm' 
+    # the default implementation prefers KDM over GDM over XDM
+    return $self->isKDMInstalled() ? 'kdm' 
+        : $self->isGDMInstalled() ? 'gdm' 
         : $self->isXDMInstalled() ? 'xdm' : undef;
 }
 
diff --git a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
index 4bd05278..7d496483 100644
--- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
@@ -508,7 +508,7 @@ sub _ensureSensibleStage3Attrs
     # one, if it isn't
     my $manager = $self->{attrs}->{'desktop::manager'} || '';
     if (!$self->{$manager}) {
-        my @managers = map { $self->{$_} ? $_ : () } qw( gdm kdm xdm );
+        my @managers = map { $self->{$_} ? $_ : () } qw( kdm gdm xdm );
         if (!@managers) {
             die _tr(
                 "no desktop manager is possible, plugin 'desktop' wouldn't work!"
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
index 55f42117..29342f3b 100644
--- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
@@ -41,6 +41,37 @@ sub setupXserverScript
     # add stuff to the script generated via Base.pm
     $script .= unshiftHereDoc(<<'    End-of-Here');
         # SuSE specific extension to stage3 xserver.sh
+        # Add InputClass to proper setup the keyboard and other input
+        echo 'Section "InputClass"
+          Identifier      "evdev pointer catchall"
+          MatchIsPointer  "on"
+          MatchDevicePath "/dev/input/event*"
+          Driver          "evdev"
+        EndSection
+        Section "InputClass"
+          Identifier "evdev keyboard catchall"
+          MatchIsKeyboard "on"
+          MatchDevicePath "/dev/input/event*"
+          Driver "evdev"
+        EndSection
+        Section "InputClass"
+          Identifier "evdev touchpad catchall"
+          MatchIsTouchpad "on"
+          MatchDevicePath "/dev/input/event*"
+          Driver "evdev"
+        EndSection
+        Section "InputClass"
+          Identifier "evdev tablet catchall"
+          MatchIsTablet "on"
+          MatchDevicePath "/dev/input/event*"
+          Driver "evdev"
+        EndSection
+        Section "InputClass"
+          Identifier "evdev touchscreen catchall"
+          MatchIsTouchscreen "on"
+          MatchDevicePath "/dev/input/event*"
+          Driver "evdev"
+        EndSection' >/mnt/etc/X11/xorg.conf.d/10-evdev.conf
         # Xorg hardware is autodetected, so no module information provided
         [ -z "${xmodule}" ] && \
           sed "/Section \"Device\"/,/EndSection/d" -i ${xfc}
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/OpenSLX/Distro/Ubuntu_8.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu_8.pm
index 0c152dba..1fa88446 100644
--- a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu_8.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu_8.pm
@@ -35,6 +35,8 @@ sub setupXserverScript
 
     $script .= unshiftHereDoc(<<'    End-of-Here');
         # Ubuntu specific extension to stage3 xserver.sh
+        # use the old kbd keyboard driver instead of evdev
+        sed "s/\"evdev\"/,/\"kbd\"/" -i ${xfc}
         testmkd /mnt/var/run/xauth
         testmkd /mnt/var/lib/xkb
         ln -sf /usr/bin/Xorg /mnt/etc/X11/X
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"
diff --git a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
index 3e50b77f..0b08ec13 100644
--- a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
+++ b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
@@ -43,7 +43,9 @@ case ${slxconf_distro_ver} in
   "10.04"|"11.3")
      ;;
   *)
-     ( hwinfo --gfxcard >/etc/hwinfo.gfxcard ) &
+     # hwinfo --gfxcard moved to general hardware detection as needed for two
+     # different plugins (bootsplash, xserver)
+     #( hwinfo --gfxcard >/etc/hwinfo.gfxcard ) &
      ( hwinfo --monitor >/etc/hwinfo.display; grep "Generic Monitor" \
        /etc/hwinfo.display >/dev/null 2>&1 && rm /etc/hwinfo.display ) &
      ;;