From d440b60a9f053d48b514d5f131e0044d0bfe4ae4 Mon Sep 17 00:00:00 2001
From: Felix Endres
Date: Sun, 29 Jan 2006 16:25:37 +0000
Subject: GDM Fix. Nachgezogener Manueller Merge.

git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@46 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/bin/hwautocfg  | 9 +++++++++
 initrd/initrd-stuff/bin/servconfig | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'initrd/initrd-stuff')

diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index b83479ea..4ba7998a 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -9,6 +9,10 @@
 #		Blub
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
+#
+#
+#
+
 
 # local functions
 displaysetup () {
@@ -273,6 +277,11 @@ fi
 # USB core is needed for presence of /proc/bus/usb
 ( modprobe ${MODPRV} usbcore && mount -n -t usbfs usbfs /proc/bus/usb ) &
 
+#fixmee: Kernelmodul für ps-maeuse laden, da sie sonst nicht von hwsetup erkannt werden.
+if [ -f /mnt/lib/modules/${KERNEL}/kernel/drivers/input/mouse/psmouse.ko ]; then
+	( modprobe ${MODPRV} psmouse )
+fi
+
 # start the knoppix hardware autodetection tool
 ( hwsetup -v > /tmp/hwsetup.info && echo "hwsetup" > /tmp/hwrun1 ) &
 
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 331b449d..0daf0004 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -28,7 +28,7 @@
 
 #######################################################################
 # copy distro specific scripts, programs, libraries and configs
-cp -a /etc/sysconfig/files/* /mnt &
+cp -a /etc/sysconfig/files/* /mnt > /dev/null 2&>1 & 
 
 # set greeting
 echo "
-- 
cgit v1.2.3-55-g7522