From 0415bbf4e78df7c65d6b69cb84f646394eba7725 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 26 May 2011 19:22:12 +0200
Subject: Separate script for hwaccess stuff ...

---
 src/initramfs/distro-specs/suse/functions-11.4 | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/initramfs')

diff --git a/src/initramfs/distro-specs/suse/functions-11.4 b/src/initramfs/distro-specs/suse/functions-11.4
index 28970297..0511fcd6 100644
--- a/src/initramfs/distro-specs/suse/functions-11.4
+++ b/src/initramfs/distro-specs/suse/functions-11.4
@@ -30,6 +30,7 @@ config_distro () {
 for dir in rc0.d rc1.d rc2.d rc3.d rc4.d rc5.d rc6.d boot.d ; do
   rm -rf /mnt/etc/init.d/${dir}/*
 done
+rm -rf /mnt/etc/init.d/.depend.*
 touch /mnt/var/log/btmp
 touch /mnt/var/log/lastlog
 }
@@ -50,8 +51,6 @@ start_dreshal="yes"
 # configure dbus (inter application communication for kde and gnome), hal
 # (hardware abstraction layer - used e.g. by powersaved)
 config_dreshal () {
-local start=1
-local stop=10
 if [ "x$start_dreshal" = "xyes" ]; then
   # create directories and set permissions with user and group id
   for dir in "/var/lib/misc" "/var/run/ConsoleKit" \
@@ -69,17 +68,20 @@ if [ "x$start_dreshal" = "xyes" ]; then
       echo "messagebus:!:103:" >> /mnt/etc/group
     # console-kit-daemon, polkitd, udisks-daemon, rtkit-daemon are often not
     # started properly (why ever)
-    d_mkrlscript entry boot.slx "# console-kit-daemon, polkitd, \
+    d_mkrlscript init hwaccess "Starting services for device access"
+    d_mkrlscript entry hwaccess "# console-kit-daemon, polkitd, \
 udisks-daemon, rtkit-daemon entries added in stage3"
-    d_mkrlscript entry boot.slx "start_daemon -f /usr/sbin/console-kit-daemon"
-    d_mkrlscript entry boot.slx "/usr/lib/polkit-1/polkitd &"
-    d_mkrlscript entry boot.slx "/usr/lib/rtkit/rtkit-daemon &"
-    d_mkrlscript entry boot.slx "/usr/lib/udisks/udisks-daemon &"
+    d_mkrlscript entry hwaccess "start_daemon -f /usr/sbin/console-kit-daemon"
+    d_mkrlscript entry hwaccess "/usr/lib/polkit-1/polkitd &"
+    d_mkrlscript entry hwaccess "/usr/lib/rtkit/rtkit-daemon &"
+    d_mkrlscript entry hwaccess "/usr/lib/udisks/udisks-daemon &"
+    d_mkrlscript close hwaccess ""
 
     rm -rf /mnt/etc/dbus-1/system.d/*etwork*anager.conf \
            /mnt/etc/dbus-1/system.d/nm-*
 
-    rllinker "dbus" $start $stop
+    rllinker "dbus" 1 20
+    rllinker "hwaccess" 16 4
   fi
 fi
 }
-- 
cgit v1.2.3-55-g7522