Merge remote-tracking branch 'mfischer/iputils' into next

[ipfire-2.x.git] / src / initscripts / init.d / collectd

diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index bdb5ca2f0bcebf0dd095717dca65b24a47566627..96bd12676cec3e0aed41344556a4249bdd720e91 100644 (file)
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -34,8 +34,10 @@ case "$1" in
                        # 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
+                               . /etc/sysconfig/lm_sensors
+                               for modul in $BUS_MODULES $HWMON_MODULES ; do
                                        modprobe $modul > /dev/null 2>&1;
                                done
                        fi
@@ -52,8 +54,10 @@ case "$1" in
                # 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
+                       . /etc/sysconfig/lm_sensors
+                       for modul in $BUS_MODULES $HWMON_MODULES ; do
                        modprobe $modul > /dev/null 2>&1;
                                if [ ${?} = 0 ]; then
                                        boot_mesg -n "$SUCCESS$modul$NORMAL ";
@@ -80,15 +84,23 @@ case "$1" in
                fi
 
                # Enable swap plugin if swap found
-               if [ "$(swapon -s | wc -l)" == "1" ]; then
+               if [ "$(swapon -s | wc -l)" == "0" ]; 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
+               
+               # sync after config update...
+               sync
 
-               boot_mesg "Starting Collection daemon..."
-               /usr/sbin/collectd -C /etc/collectd.conf
-               evaluate_retval
+               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)
                boot_mesg "Stopping Collection daemon..."
@@ -98,6 +110,8 @@ case "$1" in
                if [ "$(basename $0)" == "collectd" ]; then
                    /etc/init.d/tmpfs backup
                fi
+               # sync after backup...
+               sync
                ;;
        restart)
                ${0} stop