From 57daeeb0b8f6625978b9fabcc6283b0828ed9997 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 13 Mar 2008 11:57:07 +0100 Subject: [PATCH] collectd.init.d: Consider the DISABLE option in d_start() only. --- debian/changelog | 3 ++- debian/collectd.init.d | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ea1228..4101416 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ collectd (4.3.1-1) unstable; urgency=low migration (Closes: #469336). * New debconf template translations: - de.po, thanks to Kai Wasserbäch (Closes: #469334). + * collectd.init.d: Consider the DISABLE option in d_start() only. - -- Sebastian Harl Thu, 13 Mar 2008 11:20:03 +0100 + -- Sebastian Harl Thu, 13 Mar 2008 11:56:38 +0100 collectd (4.3.0-2) unstable; urgency=low diff --git a/debian/collectd.init.d b/debian/collectd.init.d index 1d2991f..995a369 100755 --- a/debian/collectd.init.d +++ b/debian/collectd.init.d @@ -44,11 +44,6 @@ if [ -r /etc/default/$NAME ]; then . /etc/default/$NAME fi -if test "$DISABLE" != 0; then - echo "$NAME has been disabled - see /etc/default/$NAME." - exit 0 -fi - if test "$ENABLE_COREFILES" == 1; then ulimit -c unlimited fi @@ -60,6 +55,11 @@ else fi d_start() { + if test "$DISABLE" != 0; then + echo "$NAME has been disabled - see /etc/default/$NAME." + exit 0 + fi + if ! $DAEMON -t -C "$CONFIGFILE" > /dev/null 2>&1; then $DAEMON -t -C "$CONFIGFILE" exit 1 -- 2.30.2