diff --git a/CHANGES b/CHANGES index cff06701..c686ae25 100644 --- a/CHANGES +++ b/CHANGES @@ -28,6 +28,7 @@ SVN HEAD Makefile: Drop the package and version targets Man pages: Drop "conforming to" sections Man page sensors.conf.5: Update the chip statement section + Program config/grab_busses.sh: Delete, obsolete Programs doc/*: Delete, obsolete Program etc/sensors-conf-convert: New Programs i2cdump, i2cget, i2cset: Do not force the slave address by default diff --git a/doc/progs b/doc/progs index 2dbb87ae..1fc18e33 100644 --- a/doc/progs +++ b/doc/progs @@ -9,12 +9,6 @@ For more elaborate programs (for example, GUI sensor displays), see useful_addresses.html. -* prog/config/grab_busses.sh (written in bash and awk, not installed) - This program helps you generate the `bus' statements for your configuration - file. It read /proc/bus/i2c (or the file specified on the command-line), - and prints to stdout `bus' statements reflecting the currently detected - adapters. - * prog/daemon/healthd.sh (written in bash, not installed) An example of a very simple hardware health monitoring daemon. diff --git a/lib/sensors.conf.5 b/lib/sensors.conf.5 index 8bd5b737..44c2b564 100644 --- a/lib/sensors.conf.5 +++ b/lib/sensors.conf.5 @@ -23,7 +23,7 @@ .\" .\" References consulted: .\" sensors.conf.eg by Frodo Looijaard -.TH sensors.conf 5 "June 2007" "lm-sensors 3" "Linux Programmer's Manual" +.TH sensors.conf 5 "September 2007" "lm-sensors 3" "Linux User's Manual" .SH NAME sensors.conf \- libsensors configuration file @@ -141,11 +141,7 @@ always be quoted. The second argument is the adapter name, it must match exactly the adapter name as it appears in -.I /proc/bus/i2c -(2.4 kernel) -or -.I /sys/class/i2c-adapter/i2c-*/device/name -(2.6 kernel). +.IR /sys/class/i2c-adapter/i2c-*/name . It should always be quoted as well as it will most certainly contain spaces or dashes. @@ -158,9 +154,9 @@ all .I bus statements together at the top of your configuration file. -The program -.I prog/config/grab_busses.sh -in the source distribution can help you generate these lines. +Running +.B sensors --bus-list +will generate these lines for you. .SS CHIP STATEMENT diff --git a/prog/config/grab_busses.sh b/prog/config/grab_busses.sh deleted file mode 100755 index 3d2bc769..00000000 --- a/prog/config/grab_busses.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# This simple shell script grabs the contents of /proc/bus/i2c and outputs it -# in sensors.conf format through stdout. You can use it to generate those -# nasty 'bus' statements in config files. - -if [ $# = 0 ] ; then - file=/proc/bus/i2c -elif [ $# = 1 ] ; then - file="$1" -else - echo "Syntax: grab_busses [file]" >&2 - exit 1 -fi - -if [ ! -e "$file" ]; then - echo "Can't find file \`$file';"\ - "try \`modprobe i2c-proc' for /proc/bus/i2c" >&2 - exit 1 -fi - -cat -- "$file" | awk \ - ' BEGIN { FS = "\t" } - { sub(" *$","",$3) - sub(" *$","",$4) - printf "bus \"%s\" \"%s\" \"%s\"\n",$1,$3,$4 } - { nrlines++ } - END { printf "Total lines: %d\n",nrlines > "/dev/stderr" } - '