diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-26 10:36:11 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-26 10:36:11 -0300 |
commit | 33f415176525625b793cdfa66f3fc5828214a34e (patch) | |
tree | 4f60a7d083ef4d8d0324f840d13267e58d790a17 /core/dbus-core/dbus | |
parent | 14a4ed053872549facd5a1f4817bee71bb21c8f7 (diff) | |
parent | 9a6b691757346035549dbd12d1323301d04a6675 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/wine_gecko/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus-core/dbus
testing/dbus-core/dbus.install
testing/psmisc/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd-tools.install
testing/systemd/systemd.install
testing/sysvinit/PKGBUILD
Diffstat (limited to 'core/dbus-core/dbus')
-rw-r--r-- | core/dbus-core/dbus | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/core/dbus-core/dbus b/core/dbus-core/dbus index 66b84cae0..bf532a274 100644 --- a/core/dbus-core/dbus +++ b/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 |