Changeset 5857

Timestamp:

08/22/10 18:17:57 (18 months ago)

Author:

khali

Message:

Drop legacy calls to cut. procfs had several values per file, but
sysfs doesn't.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/pwm/pwmconfig (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -8 +8 @@
   pwmconfig: Sample all fan speeds before returning to full speed (#2380)
              Wait for fans to return to full speed only once per PWM
+             Drop legacy invocations of cut
   sensors.conf.default: W83667HG config is similar to W83627EHF/DHG
   sensord: Fix support of multiple chips (#2377)

lm-sensors/trunk/prog/pwm/pwmconfig

@@ -281 +281 @@
 for i in $FAN
 do
-        # this will return the first field if there's only one (sysfs)
-        S=`cat $i | cut -d' ' -f2`
+        S=`cat $i`
         if [ "$S" = "0" -o "$S" = "-1" ]
         then
@@ -374 +373 @@
                         exit 1
                 fi
-                # this will return the first field if there's only one (sysfs)
-                S=`cat $F | cut -d' ' -f2`
+                S=`cat $F`
                 # Fan speed should never increase significantly
                 if [ $S -gt $threshold ]
@@ -477 +475 @@
                                 fanactive_min="$S+${fanactive_min}"
                         fi
-                        # this will return the first field if there's only one (sysfs)
-                        S=`cat $j | cut -d' ' -f2`
+                        S=`cat $j`
                         if [ $S -lt $threshold ]
                         then
@@ -702 +699 @@
                 pwmset $pwms $fanval
                 sleep $PDELAY
-                fanspeed=`cat $faninput | cut -d' ' -f2`
+                fanspeed=`cat $faninput`
                 if [ $fanspeed -gt $threshold ]
                 then