]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Fix collectd initskript not found sysconfig/lm_sensors
authorArne Fitzennreiter <arne_f@ipfire.org>
Tue, 28 Oct 2008 07:21:12 +0000 (08:21 +0100)
committerArne Fitzennreiter <arne_f@ipfire.org>
Tue, 28 Oct 2008 07:21:12 +0000 (08:21 +0100)
at first sensorscan if no sensors are found
Change colour of not supported modules to yellow

src/initscripts/init.d/collectd

index 2593d5d840e6587dd4f5a52e48b6f9cb78aeb515..801db9a4322ecfa476c56148e009cf5244e05e0a 100644 (file)
@@ -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;