collectd.init.d: Improved handling of the DISABLE option.

If the user wants to start collectd ("start" command line option), the
option is considered at the beginning of the script. This way we don't
print "Starting..." followed by "collectd has been disabled".

d_start() then checks the option again to correctly handle a restart.

This partly reverts commit 57daeeb0b8f6625978b9fabcc6283b0828ed9997.

diff --git a/debian/changelog b/debian/changelog
index 4101416679756aa57ed3134182114f0500d5105c..525edfc80b4156672f0cfe31cf2e217d893642f3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +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.
+  * collectd.init.d: Consider the DISABLE option only when starting collectd.
 
- -- Sebastian Harl <sh@tokkee.org>  Thu, 13 Mar 2008 11:56:38 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Sat, 29 Mar 2008 11:39:32 +0100
 
 collectd (4.3.0-2) unstable; urgency=low
 

diff --git a/debian/collectd.init.d b/debian/collectd.init.d
index 995a36945ffd1a8419651bbb19b8fb55089ff5dc..bb27de9cd89c3c29cdb47b09fc46c7e071a1170d 100755 (executable)
--- a/debian/collectd.init.d
+++ b/debian/collectd.init.d
@@ -44,6 +44,11 @@ if [ -r /etc/default/$NAME ]; then
        . /etc/default/$NAME
 fi
 
+if test "$DISABLE" != 0 -a "$1" == "start"; then
+       echo "$NAME has been disabled - see /etc/default/$NAME."
+       exit 0
+fi
+
 if test "$ENABLE_COREFILES" == 1; then
        ulimit -c unlimited
 fi
@@ -56,8 +61,9 @@ fi
 
 d_start() {
        if test "$DISABLE" != 0; then
-               echo "$NAME has been disabled - see /etc/default/$NAME."
-               exit 0
+               # we get here during restart
+               echo -n " - disabled by /etc/default/$NAME"
+               return 0
        fi
 
        if ! $DAEMON -t -C "$CONFIGFILE" > /dev/null 2>&1; then