From: octo <octo>
Date: Thu, 19 Jan 2006 22:36:26 +0000 (+0000)
Subject: Removed `/etc/default/collectd' from the debian package
X-Git-Tag: collectd-3.6.0~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8d4ee27a45cc485a8690fe7a00b7c0c7d5ba5353;p=collectd.git

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 f98488fe..ae003f03 100644
--- 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 20064715..13118fab 100755
--- 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
 }