From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 13 Mar 2008 10:57:07 +0000 (+0100)
Subject: collectd.init.d: Consider the DISABLE option in d_start() only.
X-Git-Tag: collectd-4.3.2-1~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=57daeeb0b8f6625978b9fabcc6283b0828ed9997;p=pkg-collectd.git

collectd.init.d: Consider the DISABLE option in d_start() only.
---

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 <sh@tokkee.org>  Thu, 13 Mar 2008 11:20:03 +0100
+ -- Sebastian Harl <sh@tokkee.org>  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