diff options
Diffstat (limited to 'abs/core/dbus-core/dbus')
| -rw-r--r-- | abs/core/dbus-core/dbus | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/abs/core/dbus-core/dbus b/abs/core/dbus-core/dbus index 66b84ca..bf532a2 100644 --- a/abs/core/dbus-core/dbus +++ b/abs/core/dbus-core/dbus @@ -4,18 +4,14 @@ . /etc/rc.conf . /etc/rc.d/functions -case "$1" in +case $1 in start) stat_busy "Starting D-BUS system messagebus" - if [ ! -x /var/run/dbus ] ; then - install -m755 -g 81 -o 81 -d /var/run/dbus - fi - if [ -x /usr/bin/dbus-uuidgen ] ; then - /usr/bin/dbus-uuidgen --ensure + if [[ ! -d /run/dbus ]] ; then + install -m755 -g 81 -o 81 -d /run/dbus fi - /usr/bin/dbus-daemon --system - if [ $? -gt 0 ]; then + if ! dbus-daemon --system; then stat_fail else add_daemon dbus @@ -24,27 +20,25 @@ case "$1" in ;; stop) stat_busy "Stopping D-BUS system messagebus" - [ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then + if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then stat_fail else - rm -f /var/run/dbus.pid + rm -f /run/dbus/pid rm_daemon dbus stat_done fi ;; restart) $0 stop - sleep 1 + sleep 1 $0 start ;; reload) stat_busy "Reloading D-BUS configuration" - [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \ + if ! { [[ -f /run/dbus/pid ]] && dbus-send \ --system --type=method_call \ --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig - if [ $? -gt 0 ]; then + / org.freedesktop.DBus.ReloadConfig; }; then stat_fail else stat_done @@ -52,6 +46,6 @@ case "$1" in ;; *) echo "usage: $0 {start|stop|restart|reload}" - ;; + ;; esac exit 0 |