added synaptics mouse support, temp. bugfix in init ($DEBUGLEVEL),

cleanups ...



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

4 files changed, 37 insertions, 31 deletions

diff --git a/initrd/distro-specs/debian/config-3.1 b/initrd/distro-specs/debian/config-3.1
index 2fd7a7b9..6492ed1c 100644
--- a/initrd/distro-specs/debian/config-3.1
+++ b/initrd/distro-specs/debian/config-3.1
@@ -1,9 +1,9 @@
 # Description:  distro specific settings for Debian/Sarge
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 24-03-2006
-#               Blablub
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 01-05-2006
+#               Felix Endres
 #
-# Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
+# Copyright:    (c) 2003, 2006 - RZ Universitaet Freiburg
 
 # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE 
 # and RedHat, /etc/default in Debian and Ubuntu
@@ -44,6 +44,8 @@ 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_INITDEFAULT="3"
+# fixme: is keymap.sh really needed? Should be handled in a simpler fashion
+# via boot.ld (see hwautocfg)
 D_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd keymap.sh hwclock.sh sudo dbus-1"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
diff --git a/initrd/distro-specs/gentoo/functions-2005.1 b/initrd/distro-specs/gentoo/functions-2005.1
index 284fd046..a28019ef 100644
--- a/initrd/distro-specs/gentoo/functions-2005.1
+++ b/initrd/distro-specs/gentoo/functions-2005.1
@@ -2,20 +2,20 @@
 #		linux diskless clients (executed within initial
 #		ramdisk after genconfig) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 13-04-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 30-04-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.0.2a
+# Version:      0.0.2b
 
 # distro specific stuff to initialize
 preinit () {
- :
+  :
 }
 
 postinit () {
 # rm -rf /mnt/etc/runlevels/default/*
-:
+  :
 }
 
 # distro specific general function called from servconfig script
@@ -157,9 +157,7 @@ if [ "x$start_snmp" = "xyes" ] ; then
 # configure X display manager (runlevel links and kind of manager)
 config_xdm () {
 if [ -f /mnt/etc/${D_INITDIR}/xdm ] ; then
-  sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"xdm\"," /mnt/etc/rc.conf \
-    > /etc/rc.conf
-  cp /etc/rc.conf /mnt/etc/rc.conf
+  sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"xdm\"," -i /mnt/etc/rc.conf
   ln -s /etc/${D_INITDIR}/xdm /mnt/etc/runlevels/boot/xdm
   ln -s /etc/${D_INITDIR}/xdm /mnt/etc/runlevels/default/xdm
   echo "xdm" >> /mnt/etc/runlevels/boot/.critical
@@ -170,15 +168,13 @@ fi
 config_rc_entry () {
 local var=$1
 local value=$2
-sed -e "s,$var=.*,$var=\"$value\"," /mnt/etc/rc.conf \
-  > /etc/rc.conf
-cp /etc/rc.conf /mnt/etc/rc.conf
+sed -e "s,$var=.*,$var=\"$value\"," -i /mnt/etc/rc.conf
 }
 
 # configure gdm
 config_gdm () {
 config_rc_entry "DISPLAYMANAGER" "gdm"
-# fixmee!! check for needed directories and permissions
+# fixme!! check for needed directories and permissions
 #testmkd /mnt/var/lib/gdm
 #testmkd /mnt/var/log/gdm
 #strinfile "gdm:" /mnt/etc/passwd || echo "gdm:x:50:15:Gnome Display Manager \
@@ -210,8 +206,7 @@ config_rc_entry "CONSOLEFONT" "${CONSOLE_FONT}"
 config_acpi () {
 rllinker acpid
 # remove dependencies (runs unneeded services ...)
-sed "/depend/,/}/d" /mnt/etc/${D_INITDIR}/acpid > /etc/rls
-cp /etc/rls /mnt/etc/${D_INITDIR}/acpid
+sed "/depend/,/}/d" -i /mnt/etc/${D_INITDIR}/acpid
 }
 
 # configure dbus (inter application communication for kde and gnome), hal
@@ -265,5 +260,22 @@ rllinker "ypbind"
 config_vmware () {
 rllinker "vmware-prep"
 rllinker "vmware"
+# during vmware sessions linux should not handle usb events/devices
+testmkd /mnt/var/X11R6/bin
+echo '#!/bin/sh'>> /mnt/etc/udev/rules.d/01-udev-vm.rules
+echo -e "# Script for blocking linux from handling usb \
+devices\n# during vmware sessions. If you like to remove certain modules \
+add them\n# to the list below - Dirk von Suchodoletz, <dirk@goe.net>\n\
+STATE=1\nps aux|grep -i vmware|grep -v \"grep\" &>/dev/null && { STATE=0; \
+/sbin/rmmod usb-storage &>/tmp/null; }\n\
+[ x$ACTION = xremove ] && { [ $STATE = 0 ] && /sbin/rmmod usb-storage \
+&>/dev/null; }\nexit \$STATE" > /mnt/var/X11R6/bin/vm-udev
+chmod u+x /mnt/var/X11R6/bin/vm-udev
+echo -e "# special entry to block linux from reacting to usb events during \
+running\n# vmware sessions, generated by $0 during initramfs\n# Dirk von \
+Suchodoletz, <dirk@goe.net>\nSUBSYSTEM==\"usb\", ACTION==\"add\", \
+PROGRAM=\"/var/X11R6/bin/vm-udev\", OPTIONS=\"ignore_device\"\n\
+SUBSYSTEM==\"usb\", ACTION==\"remove\", PROGRAM=\"/var/X11R6/bin/vm-udev\"" \
+  >> /mnt/etc/udev/rules.d/01-udev-vm.rules
 }
 
diff --git a/initrd/distro-specs/suse/functions-10.0 b/initrd/distro-specs/suse/functions-10.0
index 5dc40141..1d53cda6 100644
--- a/initrd/distro-specs/suse/functions-10.0
+++ b/initrd/distro-specs/suse/functions-10.0
@@ -34,12 +34,8 @@ return $result
 
 # acpi and powersave have changed
 config_acpi () {
-local start_acpi=10
-local stop_acpi=12
-local start_powersave=11
-local stop_powersave=11
-rllinker acpid "$start_acpi" "$stop_acpi"
-rllinker powersaved "$start_powersave" "$stop_powersave"
+rllinker acpid "10" "12"
+rllinker powersaved "11" "11"
 }
 
 # configure dbus (inter application communication for kde and gnome), hal
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index d3573ce0..1fd2ab6d 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -4,7 +4,7 @@
 #		functions file). This file is the main base for the 
 #		following SuSE distributions
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, /28-04-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 30-04-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
@@ -70,8 +70,6 @@ done
 # second stop
 # function for ntp configuration
 config_ntp () {
-local start="07"
-local stop="14"
 if [ -f /mnt/etc/${D_INITDIR}/ntp ] ; then
   if ! strinfile "ntp:" /mnt/etc/passwd ; then
     echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \
@@ -85,7 +83,7 @@ if [ -f /mnt/etc/${D_INITDIR}/ntp ] ; then
 hwclock &>/dev/null && hwclock -w;} ) &" \
       >>/mnt/etc/${D_INITDIR}/boot.ld
   elif [ "x$start_ntp" = "xyes" ] ; then
-    rllinker "ntp" "$start" "$stop"
+    rllinker "ntp" "07" "14"
   fi
 fi
 }
@@ -190,9 +188,9 @@ chown 50:15 /mnt/var/lib/gdm /mnt/var/log/gdm
 chmod 0750 /mnt/var/lib/gdm /mnt/var/log/gdm
 xdmcp_hosts=`echo $x_display_manager|sed -e "s; ;,;"`
 if [ "${DEBUGLEVEL}" -gt 0 ] ; then
-  debug="true"
+  local debug="true"
 else
-  debug="false"
+  local debug="false"
 fi
 echo -e "# /etc/opt/gnome/gdm/gdm.conf - file generated by $0\n\
 [daemon]
@@ -322,9 +320,7 @@ sed -e "s,RC_LANG=.*,RC_LANG=\"${LANG}\" # added in initrd," \
 
 # acpi and powersave
 config_acpi () {
-  local start_powersave=10
-  local stop_powersave=12
-  rllinker powersaved "$start_powersave" "$stop_powersave"
+  rllinker powersaved "10" "12"
 }
 
 # configure dbus (inter application communication for kde and gnome), hal