Changeset 5770 for lm-sensors/trunk/prog/pwm/pwmconfig

Timestamp:

09/16/09 17:57:53 (3 years ago)

Author:

khali

Message:

Save hwmon device paths and names in configuration file, and check them
before starting any fan control operation.

Files:

• lm-sensors/trunk/prog/pwm/pwmconfig (modified) (6 diffs)

lm-sensors/trunk/prog/pwm/pwmconfig

@@ -540 +540 @@
 fi
 
+function DevicePath()
+{
+        if [ -h "$1/device" ]
+        then
+                readlink -f "$1/device" | sed -e 's/^\/sys\///'
+        fi
+}
+
+function DeviceName()
+{
+        if [ -r "$1/name" ]
+        then
+                cat "$1/name" | sed -e 's/[[:space:]=]/_/g'
+        elif [ -r "$1/device/name" ]
+        then
+                cat "$1/device/name" | sed -e 's/[[:space:]=]/_/g'
+        fi
+}
+
+function ValidateDevices()
+{
+        local OLD_DEVPATH="$1" OLD_DEVNAME="$2" outdated=0
+        local entry device name path
+
+        for entry in $OLD_DEVPATH
+        do
+                device=`echo "$entry" | sed -e 's/=[^=]*$//'`
+                path=`echo "$entry" | sed -e 's/^[^=]*=//'`
+
+                if [ "`DevicePath "$device"`" != "$path" ]
+                then
+                        echo "Device path of $device has changed"
+                        outdated=1
+                fi
+        done
+
+        for entry in $OLD_DEVNAME
+        do
+                device=`echo "$entry" | sed -e 's/=[^=]*$//'`
+                name=`echo "$entry" | sed -e 's/^[^=]*=//'`
+
+                if [ "`DeviceName "$device"`" != "$name" ]
+                then
+                        echo "Device name of $device has changed"
+                        outdated=1
+                fi
+        done
+
+        return $outdated
+}
+
 function AskPath()
 {
@@ -567 +618 @@
 function LoadConfig()
 {
+        local OLD_DEVPATH OLD_DEVNAME
+
         # Nothing to do
         if [ ! -f "$1" ]
@@ -576 +629 @@
         echo "Loading configuration from $1 ..."
         INTERVAL=`egrep '^INTERVAL=.*$' $1 | sed -e 's/INTERVAL= *//g'`
+        OLD_DEVPATH=`egrep '^DEVPATH=.*$' $1 | sed -e 's/DEVPATH= *//g'`
+        OLD_DEVNAME=`egrep '^DEVNAME=.*$' $1 | sed -e 's/DEVNAME= *//g'`
         FCTEMPS=`egrep '^FCTEMPS=.*$' $1 | sed -e 's/FCTEMPS= *//g'`
         FCFANS=`egrep '^FCFANS=.*$' $1 | sed -e 's/FCFANS= *//g'`
@@ -586 +641 @@
 
         # Check for configuration change
-        local item
-        for item in $FCFANS
-        do
-                if [ ! -f "`echo $item | sed -e 's/=.*$//'`" ]
-                then
-                        echo "Configuration appears to be outdated, discarded"
-                        ClearConfig
-                        return 0
-                fi
-        done
+        if ! ValidateDevices "$OLD_DEVPATH" "$OLD_DEVNAME"
+        then
+                echo "Configuration appears to be outdated, discarded"
+                ClearConfig
+                return 0
+        fi
 }
 
@@ -676 +727 @@
 }
 
+# Remember the path and name of each device with at least one
+# reference (pwm, temp or fan) in the configuration file.
+# This function sets globals DEVPATH and DEVNAME as a side effect.
+function RememberDevices()
+{
+        local used entry device name path tempfandev pwmdev
+        DEVPATH=""
+        DEVNAME=""
+
+        for device in $DEVICES
+        do
+                device=`echo "$device" | sed -e 's/\/.*$//'`
+
+                used=0
+                for entry in $1 $2
+                do
+                        pwmdev=`echo "$entry" | sed -e 's/\/.*$//'`
+                        tempfandev=`echo "$entry" | sed -e 's/^[^=]*=//' -e 's/\/.*$//'`
+
+                        if [ "$device" = "$pwmdev" -o "$device" = "$tempfandev" ]
+                        then
+                                used=1
+                        fi
+                done
+                if [ "$used" -eq 0 ]
+                then
+                        continue
+                fi
+
+                # Record the device path and name. This lets the fancontrol
+                # script check that they didn't change. If they did, then the
+                # configuration file can no longer be trusted.
+                path=`DevicePath "$device"`
+                if [ -z "$DEVPATH" ]
+                then
+                        DEVPATH="$device=$path"
+                else
+                        DEVPATH="$DEVPATH $device=$path"
+                fi
+
+                name=`DeviceName "$device"`
+                if [ -z "$DEVNAME" ]
+                then
+                        DEVNAME="$device=$name"
+                else
+                        DEVNAME="$DEVNAME $device=$name"
+                fi
+        done
+}
+
 function SaveConfig()
 {
+        RememberDevices "$FCTEMPS" "$FCFANS"
+
         echo
         echo "Saving configuration to $FCCONFIG..."
@@ -684 +787 @@
         echo "# Configuration file generated by pwmconfig, changes will be lost" >$tmpfile
         echo "INTERVAL=$INTERVAL" >>$tmpfile
+        echo "DEVPATH=$DEVPATH" >>$tmpfile
+        echo "DEVNAME=$DEVNAME" >>$tmpfile
         echo "FCTEMPS=$FCTEMPS" >>$tmpfile
         echo "FCFANS=$FCFANS" >>$tmpfile