X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fcollectd;h=ed34389d3e588284cecea2bccc43c2dec038dc95;hp=e6ee268452d3311bceb1e4639a085f68f3aab386;hb=438bdd5b8c38af56266dce168466082403c13a87;hpb=4a52eae459b248456969c85b3421e1958bb521be

diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index e6ee26845..ed34389d3 100644
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -7,19 +7,51 @@
 
 case "$1" in
 	start)
+		if [ ! -e /etc/sysconfig/lm_sensors ]; then
+		    boot_mesg "Searching for Sensors..."
+		    "yes" | /usr/sbin/sensors-detect > /dev/null
+		    evaluate_retval
+		    if [ ! -e /etc/sysconfig/lm_sensors ]; then
+			echo "#No Sensors detected " > /etc/sysconfig/lm_sensors
+		    fi
+		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;
+
 		boot_mesg "Starting Collection daemon..."
 		/usr/sbin/collectd -C /etc/collectd.conf
 		evaluate_retval
+#
+# These lines are for furhter implementation of the collectd, atm the temps are
+# collected by the makegraphs script because of the standby functions
+#
 #		for disk in `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`; do boot_mesg "Bringing up hddtemp daemon for $disk ..."; /usr/sbin/hddtemp $disk -d -l localhost; evaluate_retval; done
-		boot_mesg "Bringing up mbmon daemon..."
-		/usr/bin/mbmon -P 411 -r
-		evaluate_retval
+#
+# Starting the mbmon in deamon mode to enable sensors reading for collectd
+# later mbmon will be replaced by lmsensors, if mbmon is not running on your
+# system, we advise to comment out these lines in order to prevent fail
+#
+#		boot_mesg "Bringing up mbmon daemon..."
+#		/usr/bin/mbmon -P 411 -r
+#		evaluate_retval
 		;;
 
 	stop)
-		boot_mesg "Stopping mbmon daemon..."
-		killproc /usr/bin/mbmon
-		evaluate_retval
+# if mbmon is not running on your system, we advise to comment out these lines
+# in order to prevent fail
+#		boot_mesg "Stopping mbmon daemon..."
+#		killproc /usr/bin/mbmon
+#		evaluate_retval
 #		boot_mesg "Stopping hddtemp daemon..."
 #		killproc /usr/sbin/hddtemp
 #		evaluate_retval
@@ -29,9 +61,17 @@ case "$1" in
 		;;
 
 	restart)
-		$0 stop
+
+#
+# We need to do this that way because mbmon doesn`t clear the port when killed
+# so the next startup it fails with port allready in use -> don´t restart mbmon
+#
+		boot_mesg "Stopping Collection daemon..."
+		killproc /usr/sbin/collectd
+		evaluate_retval
 		sleep 1
-		$0 start
+		boot_mesg "Starting Collection daemon..."
+		/usr/sbin/collectd -C /etc/collectd.conf
 		evaluate_retval
 				;;