- up to 1.12.2

[packages/dbus.git] / messagebus.init

diff --git a/messagebus.init b/messagebus.init
old mode 100644 (file)
new mode 100755 (executable)
index 4aa8721..b4effc5
--- a/messagebus.init
+++ b/messagebus.init
@@ -2,7 +2,7 @@
 #
 # messagebus   The D-BUS systemwide message bus
 #
-# chkconfig:   345 22 85
+# chkconfig:   345 22 78
 #
 # description: This is a daemon which broadcasts notifications of system
 #              events and other messages.
@@ -32,18 +32,16 @@ start() {
                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
+       daemon --pidfile dbus.pid --redirfds /usr/bin/dbus-daemon --system
        RETVAL=$?
        if [ $RETVAL -eq 0 ] ; then
                touch /var/lock/subsys/messagebus
-               emit --no-wait started JOB=messagebus
        fi
 }
 
@@ -54,11 +52,9 @@ stop() {
        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() {
@@ -84,8 +80,6 @@ reload() {
        RETVAL=$?
 }
 
-upstart_controlled
-
 RETVAL=0
 # See how we were called.
 case "$1" in