GDM Fix. Nachgezogener Manueller Merge.

git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@46 95ad53e4-c205-0410-b2fa-d234c58c8868

5 files changed, 15 insertions, 6 deletions

diff --git a/initrd/distro-specs/debian/config-3.1 b/initrd/distro-specs/debian/config-3.1
index a38f1fb0..a4d2f48d 100644
--- a/initrd/distro-specs/debian/config-3.1
+++ b/initrd/distro-specs/debian/config-3.1
@@ -41,7 +41,7 @@ D_BINDMNT="# "
 D_INITDIR="/init.d"
 D_INITBOOTD="/rcS.d"
 D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d"
-D_INITSCRIPTS="udev procps.sh bootlogd keymap.sh hwclock.sh sudo"
+D_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd keymap.sh hwclock.sh sudo mountall.sh"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
 D_DEFAULTCOUNTRY="de"
diff --git a/initrd/distro-specs/ubuntu/config-5.10 b/initrd/distro-specs/ubuntu/config-5.10
index 05cd51b0..319f3f59 100644
--- a/initrd/distro-specs/ubuntu/config-5.10
+++ b/initrd/distro-specs/ubuntu/config-5.10
@@ -29,8 +29,8 @@ pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
 X11/xdm/pixmaps\ndhclient.script\n\
 rc2.d/*\nrc5.d/*"
 D_BINDMPTS="tmp root home"
-D_DIRINBINDMNT="/var/run /var/log /var/tmp"
-D_RODIRSINRW="etc/gconf etc/X11/xkb /var/adm /var/lib/texmf /var/lib/gdm"
+D_DIRINBINDMNT="/var/run /var/log /var/tmp /var/lib/gdm"
+D_RODIRSINRW="etc/gconf etc/X11/xkb /var/adm /var/lib/texmf"
 D_DIRINDXS="/var/X11R6/compose-cache \
 /var/run/sysconfig/tmp /var/adm /var/lib/rpm /var/lib/nobody \
 /var/lib/pam_devperm /var/lib/bluetooth \
@@ -41,7 +41,7 @@ D_BINDMNT="# "
 D_INITDIR="/init.d"
 D_INITBOOTD="/rcS.d"
 D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d"
-D_INITSCRIPTS="udev procps.sh bootlogd keymap.sh hwclock.sh sudo"
+D_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd keymap.sh hwclock.sh sudo"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XFONTPATH="/usr/share/fonts/*"
 D_DEFAULTCOUNTRY="de"
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index 48b7cd9b..ba795634 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -150,7 +150,7 @@ done
 # add special path /var/X11R6/bin to the PATH variable
 [ "x$addpath" != "x" ] && \
   echo -e "# added path component by $0: $date\n\
-PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/SuSEconfig/profile
+PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/profile
 
 }
 
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 "