kiosk mode enabled, cleanup in functions-10.1, ignore atiixp_modem

module ...



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

2 files changed, 5 insertions, 58 deletions

diff --git a/initrd/distro-specs/suse/config-9.3 b/initrd/distro-specs/suse/config-9.3
index 954c71b9..0301b606 100644
--- a/initrd/distro-specs/suse/config-9.3
+++ b/initrd/distro-specs/suse/config-9.3
@@ -52,5 +52,5 @@ D_INITSCRIPTS="boot.udev boot.proc boot.shm boot.klog boot.loadmodules boot.cloc
 D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
 D_DEFAULTCOUNTRY="de"
-D_HWMODTOIGNORE="i8xx_tco ichxrom"
+D_HWMODTOIGNORE="i8xx_tco ichxrom snd_atiixp_modem"
 D_BOOTLOCAL="init.d/boot.local"
diff --git a/initrd/distro-specs/suse/functions-10.1 b/initrd/distro-specs/suse/functions-10.1
index 1eb49dfd..bc7b7037 100644
--- a/initrd/distro-specs/suse/functions-10.1
+++ b/initrd/distro-specs/suse/functions-10.1
@@ -1,9 +1,9 @@
 # Description:  configuration functions for SuSE 10.1 which differ from
-#		functions defined for SuSE 9.3 which is base ... General
-#		changes should be done there, version specific changes for
-#		the 10.0 here.
+#		functions defined for SuSE 9.3 and 10.0 which are base ... 
+#		General changes should be done there, version specific 
+#		changes for the 10.1 here.
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 02-04-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 20-05-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
@@ -26,7 +26,6 @@ postinit () {
 :
 }
 
-
 # udev service
 udev_hotplug () {
 local result=0
@@ -45,55 +44,3 @@ fi
 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"
-}
-
-# configure dbus (inter application communication for kde and gnome), hal
-# (hardware abstraction layer - used e.g. by powersaved) and resmgr
-# (resource manager - the user gets permissions to devices when loggin on)
-# runlevel script for haldaemon is now haldaemon instead of hal
-config_dreshal () {
-local start="05"
-local stop="18"
-if [ "x$start_dreshal" = "xyes" ]; then
-  if [ -f /mnt/etc/${D_INITDIR}/dbus ] ; then
-    strinfile "messagebus:" /mnt/etc/passwd || \
-      echo "messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false" \
-        >> /mnt/etc/passwd
-    strinfile "messagebus:" /mnt/etc/group || \
-      echo "messagebus:!:101:" >> /mnt/etc/group
-    testmkd /mnt/var/run/dbus
-    # set permissions with userid
-    echo -e "\tchown messagebus:messagebus /var/run/dbus 2>/dev/null" \
-      >>/mnt/etc/${D_INITDIR}/boot.ld
-    rllinker "dbus" "$start" "$stop"
-  fi
-  if [ -f /mnt/etc/${D_INITDIR}/resmgr ] ; then
-    testmkd /mnt/var/run/resmgr/classes
-    start="0"`expr $start + 1`
-    stop="0"`expr $start - 1`
-    rllinker "resmgr" "$start" "$stop"
-  fi
-  if [ -f /mnt/etc/${D_INITDIR}/haldaemon ] ; then
-    strinfile "haldaemon:" /mnt/etc/passwd || \
-      echo "haldaemon:x:105:103:User for haldaemon:/var/run/hal:/bin/false" \
-        >> /mnt/etc/passwd
-    strinfile "haldaemon:" /mnt/etc/group || \
-      echo "haldaemon:!:103:" >> /mnt/etc/group
-    testmkd /mnt/var/run/hal
-    # set permissions with userid
-    echo -e "\tchown haldaemon:haldaemon /var/run/hal 2>/dev/null" \
-      >>/mnt/etc/${D_INITDIR}/boot.ld
-    start="0"`expr $start + 1`
-    stop="0"`expr $start - 1`
-    rllinker "haldaemon" "$start" "$stop"
-  fi
-fi
-}