Removed `/etc/default/collectd' from the debian package

Updated `/etc/init.d/collectd' from the debian package
Updates `TODO'

diff --git a/TODO b/TODO
index f98488fe86f32b119e7a2ef1692dcb3536ef18b0..ae003f0300f47d18823b4205034942d02271b4ea 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,9 @@
+For version 3.6:
+* Fix RPM package
+
 For version 3.*:
 * Port nfs module to solaris
 * Port tape module to Linux
 * Maybe look into porting the serial module
 * Ping bug (disabled)
-* Handle sigterm
+* Write battery status, using /proc/pmu/battery_%i

diff --git a/debian/collectd.init.d b/debian/collectd.init.d
index 200647154382496348a6ba11b191d08e90452748..13118fabf4136d4de344a4b222aa3284727b2a32 100755 (executable)
--- a/debian/collectd.init.d
+++ b/debian/collectd.init.d
@@ -13,6 +13,7 @@ NAME=collectd
 DAEMON=/usr/sbin/$NAME
 SCRIPTNAME=/etc/init.d/$NAME
 ARGS=""
+CONFIG=/etc/collectd.conf
 
 # Gracefully exit if the package has been removed.
 test -x $DAEMON || exit 0
@@ -22,32 +23,13 @@ then
        . /etc/default/$NAME
 fi
 
-if [ -n "$DATA_DIR" ]; then
-       ARGS="-D $DATA_DIR"
-fi
-
-if [ -n "$PING_HOST" ]; then
-       for HOST in $PING_HOST
-       do
-               ARGS="$ARGS -p $HOST"
-       done
-fi
-
 #
 #      Function that starts the daemon/service.
 #
 d_start() {
-       if [ "x$START_SERVER" = "xyes" ]
-       then
-               $DAEMON -s $ARGS
-       fi
-       if [ "x$START_CLIENT" = "xyes" ]
-       then
-               $DAEMON -c $ARGS
-       fi
-       if [ "x$START_SERVER" != "xyes" -a "x$START_CLIENT" != "xyes" ]
+       if [ -e "$CONFIG" ]
        then
-               start-stop-daemon --start --quiet --exec $DAEMON -- -l $ARGS
+               start-stop-daemon --start --quiet --exec $DAEMON -- -C "$CONFIG"
        fi
 }