X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fcollectd;h=544b3e1f1472af9c4660a91f16b5db041ac6ae27;hp=f0f559ddb80c104cadbbc5b55a1196f2972e5fe6;hb=325aa1e1f4b1948fe3dbd1bb6c65d056b1bebe29;hpb=2d0adb746e7bf8f45c60eb12adf6d59bd93ab856

diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index f0f559ddb..544b3e1f1 100644
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -13,61 +13,102 @@ fi
 
 case "$1" in
 	start)
+		# If run from init and collectd alrady started then exit silent
+		if [ "$(basename $0)" != "collectd" ]; then
+			if [ "$(ps -A | grep " collectd$")" != "" ]; then
+				exit 0
+			fi
+		fi
+
+		# ARM does not support to scan for sensors. In that case,
+		# we create an empty configuration file.
+		machine=$(uname -m)
+		if [ "${machine:0:3}" = "arm" ]; then
+			touch /etc/sysconfig/lm_sensors
+		fi
+
+		# At first run search for sensors with sensors-detect
 		if [ ! -e /etc/sysconfig/lm_sensors ]; then
 			boot_mesg "Searching for Sensors..."
+
+			# pre scan and try to load modules
+			"yes" | /usr/sbin/sensors-detect > /dev/null
+			if [ -e /etc/sysconfig/lm_sensors ]; then
+				# Module load
+				for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
+					modprobe $modul > /dev/null 2>&1;
+				done
+			fi
+
+			# Final scan
 			"yes" | /usr/sbin/sensors-detect > /dev/null
 			evaluate_retval
 
 			if [ ! -e /etc/sysconfig/lm_sensors ]; then
 				echo "#No Sensors detected " > /etc/sysconfig/lm_sensors
-				sed -i -e "s|LoadPlugin sensors|#LoadPlugin sensors|g" /etc/collectd.conf
 			fi
 		fi
 
-		if [ ! -e $RRDLOG.bak/ ]; then
-			mkdir $RRDLOG.bak/
+		# Load sensor modules only first start
+		if [ ! -e /var/lock/sensors_modules ]; then
+			touch /var/lock/sensors_modules
+			boot_mesg -n "Loading Sensor Modules: "
+			for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
+			modprobe $modul > /dev/null 2>&1;
+				if [ ${?} = 0 ]; then
+					boot_mesg -n "$SUCCESS$modul$NORMAL ";
+				else
+					boot_mesg -n "$WARNING$modul$NORMAL ";
+				fi
+			done
+			boot_mesg;
+			echo_ok;
 		fi
 
-		/etc/init.d/collectd restore
+		# Enable sensors plugin if sensors found
+		if [ "$( sensors 2>&1 | grep 'No sensors found!' | wc -l )" == "1" ]; then
+			sed -i -e "s|^LoadPlugin sensors|#LoadPlugin sensors|g" /etc/collectd.conf
+		else
+			sed -i -e "s|^#LoadPlugin sensors|LoadPlugin sensors|g" /etc/collectd.conf
+		fi
 
-		boot_mesg -n "Loading Sensor Modules..."
-		for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
-		modprobe $modul > /dev/null 2>&1;
-			if [ ${?} = 0 ]; then
-				boot_mesg -n "$SUCCESS$modul$NORMAL ";
-			else
-				boot_mesg -n "$FAILURE$modul$NORMAL ";
-			fi
-		done
-		boot_mesg;
-		echo_ok;
+		# Enable thermal plugin if thermal_zone found
+		if [ ! -e  /sys/class/thermal/thermal_zone0 ]; then
+			sed -i -e 's|^include "/etc/collectd.thermal"$|#include "/etc/collectd.thermal"|g' /etc/collectd.conf
+		else
+			sed -i -e 's|^#include "/etc/collectd.thermal"$|include "/etc/collectd.thermal"|g' /etc/collectd.conf
+		fi
 
-		boot_mesg "Starting Collection daemon..."
-		/usr/sbin/collectd -C /etc/collectd.conf
-		evaluate_retval
+		# Enable swap plugin if swap found
+		if [ "$(swapon -s | wc -l)" == "1" ]; then
+			sed -i -e "s|^LoadPlugin swap|#LoadPlugin swap|g" /etc/collectd.conf
+		else
+			sed -i -e "s|^#LoadPlugin swap|LoadPlugin swap|g" /etc/collectd.conf
+		fi
+
+		if [ $(date +%Y) -gt 2011 ]; then
+			boot_mesg "Starting Collection daemon..."
+			/usr/sbin/collectd -C /etc/collectd.conf
+			evaluate_retval
+		else
+			boot_mesg "collectd: cannot start with incorrect time ($(date))."
+			echo_warning;
+		fi
 		;;
 	stop)
-		/etc/init.d/collectd backup
 		boot_mesg "Stopping Collection daemon..."
 		killproc /usr/sbin/collectd
 		evaluate_retval
+		# Save the ramdisk at manual stop but not at shutdown
+		if [ "$(basename $0)" == "collectd" ]; then
+		    /etc/init.d/tmpfs backup
+		fi
 		;;
 	restart)
 		${0} stop
 		sleep 1
 		${0} start
 		;;
-	backup)
-		boot_mesg "Save rrd files from ramd..."
-		cp -pR $RRDLOG/* $RRDLOG.bak/
-		evaluate_retval
-		;;
-	restore)
-		if [ -e $RRDLOG.bak ];then
-			boot_mesg "Copying rrd files to ramd..."
-			cp -pR $RRDLOG.bak/* $RRDLOG/
-		fi
-		;;
 	status)
 		statusproc /usr/sbin/collectd
 		;;