[Pkg-utopia-commits] r1424 - in /packages/unstable/dbus/debian: changelog dbus.init

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Apr 19 21:28:17 2007
New Revision: 1424

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1424
Log:
Add some safety checks and support for file-rc. (Closes: #419984)

Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/dbus.init

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=1424&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Thu Apr 19 21:28:17 2007
@@ -1,3 +1,10 @@
+dbus (1.0.2-5) unstable; urgency=low
+
+  * debian/dbus.init
+    + Add some safety checks and support for file-rc. (Closes: #419984)
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 18 Apr 2007 19:50:29 +0200
+
 dbus (1.0.2-4) unstable; urgency=low
 
   * debian/dbus.init

Modified: packages/unstable/dbus/debian/dbus.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.init?rev=1424&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.init (original)
+++ packages/unstable/dbus/debian/dbus.init Thu Apr 19 21:28:17 2007
@@ -67,7 +67,17 @@
   fi
 
   # Get the list of services active in this runlevel
-  services=$(grep -l "^# Required-Start:.*dbus" /etc/rc${r}.d/S??* | sort $param)
+  if [ -d /etc/rc${r}.d/ ] ; then # sysv-rc
+    services=$(grep -l "^# Required-Start:.*dbus" /etc/rc${r}.d/S??* | sort $param)
+  elif [ -f /etc/runlevel.conf ] ; then # file-rc
+    list=$(grep -l "^# Required-Start:.*dbus" /etc/init.d/*)
+    services=$( for i in $list ; do
+      grep -E "^[[:digit:]]{2}[[:space:]]+[0-9,-S]+[[:space:]]+.*$r.*[[:space:]]+$i$" /etc/runlevel.conf
+    done  | sort $param | awk '{print $4}' )
+  else
+    services=""
+    log_warning_msg "Unable to determine dependent services: unknown init system"
+  fi
 
   # Start the services in the correct order
   for i in $services ; do