Changeset 4369

Timestamp:

04/17/07 11:09:54 (6 years ago)

Author:

khali

Message:

rrd/sens_update_rrd: Support non-i2c devices. Since kernel 2.6.14, hardware
monitoring devices are better accessed through the hwmon class. Original
patch from Jeff Kosowsky.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/rrd/sens_update_rrd (modified) (2 diffs)

lm-sensors/trunk/CHANGES

@@ -7 +7 @@
            Add dme1737 support
   Program isadump: Detect when address bit 7 is a busy flag
+  Program sens_update_rrd: Support non-i2c devices (hwmon class)
   Program sensors: Drop ddcmon and eeprom support
                    Add dme1737 support

lm-sensors/trunk/prog/rrd/sens_update_rrd

@@ -30 +30 @@
 then
         echo "usage: $0 database.rrd sensor"
-        echo "       sensor example: w83781d-isa-0290 (2.4) or 0-0290 (2.6)"
+        echo "       sensor example: w83781d-isa-0290 (2.4 kernel)"
+        echo "                       0-0290 (early 2.6 kernel)"
+        echo "                       hwmon0 (kernel 2.6.14 or later)"
         exit 1
 fi
@@ -39 +41 @@
 SENSDIR=/proc/sys/dev/sensors
 SDIR=/sys/bus/i2c/devices
-if [ ! -d $SENSDIR ]
+HWMONDIR=/sys/class/hwmon
+SENSDEV=$2
+if [ -d $HWMONDIR ]
 then
-        if [ ! -d $SDIR ]
-        then
-                echo $0: 'No sensors found! (modprobe sensor modules?)'
-                exit 1
-        else
-                SYSFS=1
-                SENSDIR=$SDIR
-        fi      
+        SYSFS=1
+        SENSDIR=$HWMONDIR
+        SENSDEV=$SENSDEV/device
+elif [ -d $SDIR ]
+then
+        SYSFS=1
+        SENSDIR=$SDIR
+elif [ ! -d $SENSDIR]
+then
+        echo $0: 'No sensors found! (modprobe sensor modules?)'
+        exit 1
 fi
 
-SENSDEV=$2
 SENS=$SENSDIR/$SENSDEV
 if [ ! -r $SENS ]