summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-07-17 12:02:44 +0000
committerMichael Biebl <biebl@debian.org>2010-07-17 12:02:44 +0000
commitceeff121805dcf435c6eafcb4bef16477fac5b6f (patch)
treef89dd8975a7f1ce90ab008d97301ffc3cab58e8b
parent39fcbb792e47680fba5fdf016689ba76cf06ee89 (diff)
downloaddbus-ceeff121805dcf435c6eafcb4bef16477fac5b6f.tar.gz
* debian/dbus.init
- Simplify check in start_it_up() by using the existing status action. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@3652 ceb527fc-18e6-0310-9fe2-813c157c29e7
-rw-r--r--debian/changelog2
-rw-r--r--debian/dbus.init3
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 9b3a262a..a1880573 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ dbus (1.2.24-2) UNRELEASED; urgency=low
- Use architecture wildcard linux-any for libselinux1-dev Build-Depends.
- Use Breaks instead of Conflicts as recommended by the new policy.
- Remove old Conflicts which is no longer relevant.
+ * debian/dbus.init
+ - Simplify check in start_it_up() by using the existing status action.
-- Michael Biebl <biebl@debian.org> Thu, 15 Jul 2010 01:10:46 +0200
diff --git a/debian/dbus.init b/debian/dbus.init
index 6564c103..e8abdf50 100644
--- a/debian/dbus.init
+++ b/debian/dbus.init
@@ -99,8 +99,7 @@ start_it_up()
fi
if [ -e $PIDFILE ]; then
- PIDDIR=/proc/$(cat $PIDFILE)
- if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+ if $0 status > /dev/null ; then
log_success_msg "$DESC already started; not starting."
return
else