Changeset 4439

Timestamp:

06/12/07 13:26:11 (6 years ago)

Author:

khali

Message:

fancontrol: Better integration with init scripts (picked from Suse)
* Do not return with an error when receiving SIGTERM.
* Handle signals while sleeping.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/pwm/fancontrol (modified) (9 diffs)

lm-sensors/trunk/CHANGES

@@ -20 +20 @@
                       Check for configuration file validity
                       Support optional min and max PWM values
+                      Better integration with init scripts
   Program pwmconfig: Use smaller steps for low PWM values
                      Support optional min and max PWM values

lm-sensors/trunk/prog/pwm/fancontrol

@@ -229 +229 @@
 function restorefans()
 {
+        local status=$1
         echo 'Aborting, restoring fans...'
         let fcvcount=0
@@ -238 +239 @@
         done
         echo 'Verify fans have returned to full speed'
-        exit 1
-}
-
-trap restorefans SIGHUP SIGINT SIGQUIT SIGTERM SIGKILL
+        exit $status
+}
+
+trap 'restorefans 0' SIGQUIT SIGTERM
+trap 'restorefans 1' SIGHUP SIGINT
 
 # main function
@@ -263 +265 @@
                 then
                         echo "Error reading temperature from $DIR/$tsens"
-                        restorefans
+                        restorefans 1
                 fi
                 if [ "$SYSFS" = "1" ]
@@ -276 +278 @@
                 then
                         echo "Error reading PWM value from $DIR/$pwmo"
-                        restorefans
+                        restorefans 1
                 fi
                 if [ "$SYSFS" != "1" ]
@@ -290 +292 @@
                         then
                                 echo "Error reading Fan value from $DIR/$fan"
-                                restorefans
+                                restorefans 1
                         fi
                         if [ "$SYSFS" != "1" ]
@@ -327 +329 @@
                   then # if fan was stopped start it using a safe value
                         echo $minsa > $pwmo
-                        sleep 1
+                        # Sleep while still handling signals
+                        read < <(exec sleep 1)
                   fi
                 fi
@@ -334 +337 @@
                 then
                         echo "Error writing PWM value to $DIR/$pwmo"
-                        restorefans
+                        restorefans 1
                 fi
                 if [ "$DEBUG" != "" ]
@@ -353 +356 @@
         then
                 echo "Error enabling PWM on $DIR/$pwmo"
-                restorefans
+                restorefans 1
         fi
         let fcvcount=$fcvcount+1
@@ -364 +367 @@
 do
         UpdateFanSpeeds
-        sleep $INTERVAL
+        # Sleep while still handling signals
+        read < <(exec sleep $INTERVAL)
 done