diff options
| author | Sjoerd Simons <sjoerd@debian.org> | 2007-04-17 15:27:20 +0000 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@debian.org> | 2007-04-17 15:27:20 +0000 |
| commit | 5f061e4d8301de99f47ea8f56c5dfe54d7e7ed24 (patch) | |
| tree | 1ba7bbcdc7c9ff3b1fc70f79a498a1e2af878338 /debian/dbus.init | |
| parent | 6166cca76248107902a740292988d6dd9a74858d (diff) | |
| download | dbus-5f061e4d8301de99f47ea8f56c5dfe54d7e7ed24.tar.gz | |
* debian/dbus.init
+ Don't return an error, if start is called when there is already a bus
running.
* debian/dbus.init
+ Handle errors from /sbin/runlevel. Fixes dbus installation in chroots.
(Closes: #419655)
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@1411 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian/dbus.init')
| -rw-r--r-- | debian/dbus.init | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/debian/dbus.init b/debian/dbus.init index 66006c93..155f0b5a 100644 --- a/debian/dbus.init +++ b/debian/dbus.init @@ -52,9 +52,12 @@ dependent_services() [ ! -z $runlevel ] && return # Determine current runlevel - r=$(/sbin/runlevel) + r=$(/sbin/runlevel) || true + + [ $r = "unknown" ] && return + r=${r#*\ } - + if [ "$1" = "stop" ] ; then param="--reverse" action="stop" @@ -87,6 +90,7 @@ start_it_up() PIDDIR=/proc/$(cat $PIDFILE) if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then log_success_msg "$DESC already started; not starting." + return else log_success_msg "Removing stale PID file $PIDFILE." rm -f $PIDFILE |