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

diff --git a/debian/changelog b/debian/changelog
index 2ea1228ac071bf9aaf8ecf7144e8927a69bd6723..4101416679756aa57ed3134182114f0500d5105c 100644 (file)
--- 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 1d2991f6487c3c832740924ed270ee36d8733ecd..995a36945ffd1a8419651bbb19b8fb55089ff5dc 100755 (executable)
--- 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