Changeset 5765

Timestamp:

09/08/09 18:52:29 (4 years ago)

Author:

khali

Message:

Check that all referenced sysfs files exist before starting. If not,
quilt immediately. Better no fan control than fan control using an
out-of-sync configuration file.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/pwm/fancontrol (modified) (2 diffs)
• prog/pwm/fancontrol.8 (modified) (2 diffs)

lm-sensors/trunk/CHANGES

@@ -4 +4 @@
 SVN-HEAD
   libsensors: Support upcoming sysfs path to i2c adapters
+  fancontrol: Check that all referenced sysfs files exist
   pwmconfig: Exit immediately if not root
   sensors.conf.default: Encourage user to not modify this file

lm-sensors/trunk/prog/pwm/fancontrol

@@ -153 +153 @@
 }
 
+# Check that all referenced sysfs files exist
+function CheckFiles {
+        local outdated=0
+
+        let fcvcount=0
+        while (( $fcvcount < ${#AFCPWM[@]} )) # go through all pwm outputs
+        do
+                pwmo=${AFCPWM[$fcvcount]}
+                if [ ! -w $pwmo ]
+                then
+                        echo "Error: file $pwmo doesn't exist"
+                        outdated=1
+                fi
+                let fcvcount=$fcvcount+1
+        done
+
+        let fcvcount=0
+        while (( $fcvcount < ${#AFCTEMP[@]} )) # go through all temp inputs
+        do
+                tsen=${AFCTEMP[$fcvcount]}
+                if [ ! -r $tsen ]
+                then
+                        echo "Error: file $tsen doesn't exist"
+                        outdated=1
+                fi
+                let fcvcount=$fcvcount+1
+        done
+
+        let fcvcount=0
+        while (( $fcvcount < ${#AFCFAN[@]} )) # go through all fan inputs
+        do
+                fan=${AFCFAN[$fcvcount]}
+                if [ ! -r $fan ]
+                then
+                        echo "Error: file $fan doesn't exist"
+                        outdated=1
+                fi
+                let fcvcount=$fcvcount+1
+        done
+
+        if [ $outdated -eq 1 ]
+        then
+                echo
+                echo "At least one referenced file is missing. Either some"
+                echo "required kernel modules haven't been loaded, or your"
+                echo "configuration file is outdated. In the latter case,"
+                echo "you should run pwmconfig again."
+        fi
+
+        return $outdated
+}
+
 if [ -f "$1" ]
 then
@@ -181 +233 @@
 fi
 cd $DIR
+
+CheckFiles || exit 1
 
 if [ -f "$PIDFILE" ]

lm-sensors/trunk/prog/pwm/fancontrol.8

@@ -1 @@
-.TH FANCONTROL 8 "January 2009" "lm-sensors 3"
+.TH FANCONTROL 8 "September 2009" "lm-sensors 3"
 .SH NAME
 fancontrol \- automated software based fan speed regulation
@@ -93 +93 @@
 editing the config file directly following the rules above.
 
+Upon starting, fancontrol will make sure that all referenced sysfs files
+do exist. If not, it will quit immediately, upon the assumption that the
+configuration file may be out-of-sync with the loaded kernel drivers.
+
 .SH THE ALGORITHM