[Pkg-utopia-commits] r1411 - packages/unstable/dbus/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2007-04-17 15:27:20 +0000 (Tue, 17 Apr 2007)
New Revision: 1411

Modified:
   packages/unstable/dbus/debian/changelog
   packages/unstable/dbus/debian/dbus.init
Log:
* debian/dbus.init
  + Don't return an error, if start is called when there is already a bus
    running.
* debian/dbus.init
  + Handle errors from /sbin/runlevel. Fixes dbus installation in chroots.
    (Closes: #419655)

Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2007-04-16 21:29:23 UTC (rev 1410)
+++ packages/unstable/dbus/debian/changelog	2007-04-17 15:27:20 UTC (rev 1411)
@@ -3,8 +3,14 @@
   * debian/dbus.post{inst,rm}
     + Restart dbus on upgrades again. Might break some applications, but they
       should be fixed.
+  * debian/dbus.init
+    + Don't return an error, if start is called when there is already a bus
+      running.
+  * debian/dbus.init
+    + Handle errors from /sbin/runlevel. Fixes dbus installation in chroots.
+      (Closes: #419655)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 14 Apr 2007 15:24:57 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 17 Apr 2007 17:24:46 +0200
 
 dbus (1.0.2-2) unstable; urgency=low
 

Modified: packages/unstable/dbus/debian/dbus.init
===================================================================
--- packages/unstable/dbus/debian/dbus.init	2007-04-16 21:29:23 UTC (rev 1410)
+++ packages/unstable/dbus/debian/dbus.init	2007-04-17 15:27:20 UTC (rev 1411)
@@ -52,9 +52,12 @@
   [ ! -z $runlevel ] && return 
 
   # Determine current runlevel
-  r=$(/sbin/runlevel)
+  r=$(/sbin/runlevel) || true
+
+  [ $r = "unknown" ] && return
+
   r=${r#*\ }
-  
+
   if [ "$1" = "stop" ] ; then
     param="--reverse"
     action="stop"
@@ -87,6 +90,7 @@
     PIDDIR=/proc/$(cat $PIDFILE)
     if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
       log_success_msg "$DESC already started; not starting."
+      return
     else
       log_success_msg "Removing stale PID file $PIDFILE."
       rm -f $PIDFILE