Little core7 fix because of mbmon restart probs

Added the collectd to the log view


git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1195 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

config/rootfiles/core/7/files

@@ -19,3 +19,4 @@ var/ipfire/graphs.pl
 var/ipfire/menu.d/20-status.menu
 var/ipfire/langs
 lib/modules/2.6.16.57-ipfire/kernel/drivers/ieee1394/sbp2.ko
+html/cgi-bin/logs.cgi/log.dat

html/cgi-bin/logs.cgi/log.dat

@@ -57,6 +57,7 @@ my %sections = (
         'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])',
         'dns' => '(dnsmasq\[.*\]: )',
         'dhcp' => '(dhcpd: )',
+        'collectd' => '(collectd: )',
         'cron' => '(fcron\[.*\]: )',
         'ntp' => '(ntpd(?:ate)?\[.*\]: )',
         'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
@@ -73,6 +74,7 @@ my %trsections = (
         'dns' => 'DNS',
         'dhcp' => "$Lang::tr{'dhcp server'}",
         'cron' => 'Cron',
+        'collectd' => 'Collectd',
         'ntp' => 'NTP',
         'ssh' => 'SSH',
         'auth' => "$Lang::tr{'loginlogout'}",

src/initscripts/init.d/collectd

@@ -10,20 +10,27 @@ case "$1" in
 		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
+#
+# 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
-		if [ ${?} = 0 ]; then
-		    echo_ok;
-		fi
+		evaluate_retval
 		;;
 
 	stop)
-#		boot_mesg "Stopping mbmon daemon..."
-#		killproc /usr/bin/mbmon
-#		if [ ${?} = 0 ]; then
-#		    echo_ok;
-#		fi
+# 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
@@ -33,9 +40,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
 				;;