- updated to 1.4.20

[packages/dbus.git] / messagebus.init

diff --git a/messagebus.init b/messagebus.init
index c44abdee50abb7392ef5dc842534123b25a47f65..d70ccd6ab6fb03c3f8732c1076d19ef5d026d7dd 100644 (file)
--- a/messagebus.init
+++ b/messagebus.init
@@ -12,13 +12,15 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
+upstart_controlled
+
 # Get network config
 . /etc/sysconfig/network
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network ]; then
-               msg_network_down messagebus
+               msg_network_down "D-BUS Message bus"
                exit 1
        fi
 else
@@ -27,41 +29,61 @@ fi
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/messagebus ]; then
-               msg_starting messagebus
-               # if capability is modular, load it
-               if modinfo capability >/dev/null 2>&1; then
-                       modprobe -s capability
-               fi
-               dbus-uuidgen --ensure
-               daemon --pidfile dbus.pid /usr/bin/dbus-daemon --system
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/messagebus
-       else
-               msg_already_running messagebus
+       if [ -f /var/lock/subsys/messagebus ]; then
+               msg_already_running "D-BUS Message bus"
+               return
+       fi
+
+       emit starting JOB=messagebus
+       msg_starting "D-BUS Message bus"
+       # if capability is modular, load it
+       if modinfo capability >/dev/null 2>&1; then
+               modprobe -s capability
+       fi
+       dbus-uuidgen --ensure
+       daemon --pidfile dbus.pid /usr/bin/dbus-daemon --system
+       RETVAL=$?
+       if [ $RETVAL -eq 0 ] ; then
+               touch /var/lock/subsys/messagebus
+               emit --no-wait started JOB=messagebus
        fi
 }
 
 stop() {
-       if [ -f /var/lock/subsys/messagebus ]; then
-               # Stop daemons.
-               msg_stopping messagebus
-               killproc --pidfile dbus.pid dbus-daemon
-               rm -f /var/lock/subsys/messagebus
-               rm -f /var/run/dbus.pid
-       else
-               msg_not_running messagebus
+       if [ ! -f /var/lock/subsys/messagebus ]; then
+               msg_not_running "D-BUS Message bus"
+               return
        fi
+
+       # Stop daemons.
+       emit stopping JOB=messagebus
+       msg_stopping "D-BUS Message bus"
+       killproc --pidfile dbus.pid dbus-daemon
+       rm -f /var/lock/subsys/messagebus /var/run/dbus.pid
+       emit --no-wait stopped JOB=messagebus
 }
 
 condrestart() {
-       if [ -f /var/lock/subsys/cpqarrayd ]; then
-               stop
-               start
-       else
-               msg_not_running messagebus
+       if [ ! -f /var/lock/subsys/messagebus ]; then
+               msg_not_running "D-BUS Message bus"
                RETVAL=$1
+               return
+       fi
+
+       stop
+       start
+}
+
+reload() {
+       if [ ! -f /var/lock/subsys/messagebus ]; then
+               msg_not_running "D-BUS Message bus"
+               RETVAL=7
+               return
        fi
+
+       msg_reloading "D-BUS Message bus"
+       killproc --pidfile dbus.pid dbus-daemon -HUP
+       RETVAL=$?
 }
 
 RETVAL=0
@@ -81,17 +103,10 @@ case "$1" in
        condrestart 0
        ;;
   reload|force-reload)
-       if [ -f /var/lock/subsys/messagebus ]; then
-               msg_reloading messagebus
-               killproc dbus-daemon -HUP
-               RETVAL=$?
-       else
-               msg_not_running messagebus
-               RETVAL=7
-       fi
+       reload
        ;;
   status)
-       status --pidfile /var/run/dbus.pid messagebus dbus-daemon
+       status --pidfile dbus.pid messagebus dbus-daemon
        RETVAL=$?
        ;;
   *)