From: Maniacikarus <maniacikarus@ipfire.org>
Date: Tue, 28 Oct 2008 17:15:07 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-final~28
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=ea317fe337f95e1e9d14dcd85b3cf90b18f89cab;hp=fcc535236fe6178d68007ece7793746320549b61

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
---

diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index 2593d5d840..801db9a432 100644
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -17,15 +17,16 @@ case "$1" in
 		if [ ! -e /etc/sysconfig/lm_sensors ]; then
 			boot_mesg "Searching for Sensors..."
 
-			# First scan
+			# 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
 
-			# Module load
-			for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
-			    modprobe $modul > /dev/null 2>&1;
-			done
-
-			# Second scan
+			# Final scan
 			"yes" | /usr/sbin/sensors-detect > /dev/null
 			evaluate_retval
 
@@ -34,13 +35,13 @@ case "$1" in
 			fi
 		fi
 
-		boot_mesg -n "Loading Sensor 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 "$FAILURE$modul$NORMAL ";
+				boot_mesg -n "$WARNING$modul$NORMAL ";
 			fi
 		done
 		boot_mesg;