Fix inotify shutdown

[platform/upstream/dbus.git] / bus / messagebus.in

diff --git a/bus/messagebus.in b/bus/messagebus.in
index 45388a5..1f1004b 100755 (executable)
--- a/bus/messagebus.in
+++ b/bus/messagebus.in
@@ -2,41 +2,60 @@
 #
 # messagebus:   The D-BUS systemwide message bus
 #
-# chkconfig: 345 97 03
+# chkconfig: 345 22 85
 # description:  This is a daemon which broadcasts notifications of system events \
 #               and other messages. See http://www.freedesktop.org/software/dbus/
 #
-# processname: dbus-daemon-1
+# processname: dbus-daemon
 # pidfile: @DBUS_SYSTEM_PID_FILE@
 #
+### BEGIN INIT INFO
+# Provides: messagebus
+# Required-Start: $syslog $local_fs
+# Required-Stop: $syslog $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: The D-Bus systemwide message bus
+# Description: This is a daemon which broadcasts notifications of system 
+#  events and other messages. See http://www.freedesktop.org/software/dbus
+### END INIT INFO
 
 # Sanity checks.
-[ -x @EXPANDED_BINDIR@/dbus-daemon-1 ] || exit 0
+[ -x @EXPANDED_BINDIR@/dbus-daemon ] || exit 0
 
 # Source function library.
 . @EXPANDED_SYSCONFDIR@/rc.d/init.d/functions
 
+# so we can rearrange this easily
+processname=dbus-daemon
+servicename=messagebus
+
 RETVAL=0
 
 start() {
     echo -n $"Starting system message bus: "
-    daemon --check messagebus dbus-daemon-1 --system
+    if [ -x @EXPANDED_BINDIR@/dbus-uuidgen ] ; then
+        @EXPANDED_BINDIR@/dbus-uuidgen --ensure
+    fi
+
+    daemon --check $servicename $processname --system
     RETVAL=$?
     echo
-    [ $RETVAL -eq 0 ] && touch @EXPANDED_LOCALSTATEDIR@/lock/subsys/messagebus
+    [ $RETVAL -eq 0 ] && touch @EXPANDED_LOCALSTATEDIR@/lock/subsys/$servicename
 }
 
 stop() {
     echo -n $"Stopping system message bus: "
 
-    ## we don't want to kill all the per-user dbus-daemon-1, we want
+    ## we don't want to kill all the per-user $processname, we want
     ## to use the pid file *only*; because we use the fake nonexistent 
-    ## program name "messagebus" that should be safe-ish
-    killproc messagebus -TERM
+    ## program name "$servicename" that should be safe-ish
+    killproc $servicename -TERM
     RETVAL=$?
     echo
     if [ $RETVAL -eq 0 ]; then
-        rm -f @EXPANDED_LOCALSTATEDIR@/lock/subsys/messagebus
+        rm -f @EXPANDED_LOCALSTATEDIR@/lock/subsys/$servicename
+        rm -f @DBUS_SYSTEM_PID_FILE@
     fi
 }
 
@@ -49,7 +68,7 @@ case "$1" in
         stop
         ;;
     status)
-        status messagebus
+        status $processname
         RETVAL=$?
         ;;
     restart)
@@ -57,7 +76,7 @@ case "$1" in
         start
         ;;
     condrestart)
-        if [ -f @EXPANDED_LOCALSTATEDIR@/lock/subsys/messagebus ]; then
+        if [ -f @EXPANDED_LOCALSTATEDIR@/lock/subsys/$servicename ]; then
             stop
             start
         fi