diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-05-02 13:00:40 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-05-02 13:00:40 +0000 |
| commit | 5d6c8d86679e3b2ef34b6e7323d6043945845451 (patch) | |
| tree | 02f40cbc4ec0a7507ccd35bf850c40472349ea81 /packages/dbus | |
| parent | 7f20dabaef2d4b55811836cdce58ed4283816cf6 (diff) | |
dbus 1.2.1 bring some sanity in the init script, e.g.
* don't hide problems
* use proper PID files
* allow restart
Diffstat (limited to 'packages/dbus')
| -rw-r--r-- | packages/dbus/dbus-1.2.1/dbus-1.init | 17 | ||||
| -rw-r--r-- | packages/dbus/dbus_1.2.1.bb | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/packages/dbus/dbus-1.2.1/dbus-1.init b/packages/dbus/dbus-1.2.1/dbus-1.init index 0725083c69..bf002748a1 100644 --- a/packages/dbus/dbus-1.2.1/dbus-1.init +++ b/packages/dbus/dbus-1.2.1/dbus-1.init @@ -2,14 +2,15 @@ # -*- coding: utf-8 -*- # Debian init.d script for D-BUS # Copyright © 2003 Colin Walters <walters@debian.org> +# Copyright 2008 OE Team set -e DAEMON=/usr/bin/dbus-daemon NAME=dbus DAEMONUSER=messagebus -PIDDIR=/var/run/dbus -PIDFILE=$PIDDIR/pid +RUNDIR=/var/run/dbus +PIDFILE=/var/run/messagebus.pid UUIDDIR=/var/lib/dbus DESC="system message bus" EVENTDIR=/etc/dbus-1/event.d @@ -27,10 +28,10 @@ test "$ENABLED" != "0" || exit 0 start_it_up() { - if [ ! -d $PIDDIR ]; then - mkdir -p $PIDDIR - chown $DAEMONUSER $PIDDIR - chgrp $DAEMONUSER $PIDDIR + if [ ! -d $RUNDIR ]; then + mkdir -p $RUNDIR + chown $DAEMONUSER $RUNDIR + chgrp $DAEMONUSER $RUNDIR fi if [ -e $PIDFILE ]; then PIDDIR=/proc/$(cat $PIDFILE) @@ -51,7 +52,7 @@ start_it_up() dbus-uuidgen --ensure echo -n "Starting $DESC: " - start-stop-daemon --start --quiet --pidfile $PIDFILE \ + start-stop-daemon --start --pidfile $PIDFILE \ --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS echo "$NAME." if [ -d $EVENTDIR ]; then @@ -66,7 +67,7 @@ shut_it_down() run-parts --arg=stop $EVENTDIR fi echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --oknodo --pidfile $PIDFILE \ --user $DAEMONUSER # We no longer include these arguments so that start-stop-daemon # can do its job even given that we may have been upgraded. diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb index f331b140aa..8e3e329fde 100644 --- a/packages/dbus/dbus_1.2.1.bb +++ b/packages/dbus/dbus_1.2.1.bb @@ -1,3 +1,3 @@ include dbus.inc -PR = "r0" +PR = "r1" |