diff --git a/CHANGES b/CHANGES index e2b94337..67765c3b 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,7 @@ lm_sensors CHANGES file SVN HEAD File sensors.conf.eg: Add a dme1737 section + File lm_sensors.sysconfig: Delete, now generated by sensors-detect Library: Clean up pwm symbol names translation Add dme1737 support Man page sensors.conf.5: Update the chip statement section diff --git a/prog/init/README b/prog/init/README index ab8dcdb2..f3392f00 100644 --- a/prog/init/README +++ b/prog/init/README @@ -12,14 +12,13 @@ mechanism (i.e. SVR4-based), as opposed to the everything-in-one-script (/etc/rc or /etc/rc.local) like the BSD-based systems do. The lm_sensors.init file should be copied to /etc/rc.d/init.d/lm_sensors. For more information see the top of the file. -It requires the /etc/sysconfig/sensors file, which identifies +It requires the /etc/sysconfig/lm_sensors file, which identifies the correct modules. -The /etc/sysconfig/lm_sensors file is only a list of modules, -as would be determined by running sensors-detect. -The lm_sensors.sysconfig file contains the MODULE_# variable definitions; -it should be modified for your setup and then -copied to /etc/sysconfig/lm_sensors. +The /etc/sysconfig/lm_sensors file is generated by running sensors-detect. +Once the script is done detecting the hardware monitoring devices, it will +list all the required modules in that file, so that they can be loaded +automatically at boot time. SuSE users will want to use lm_sensors.init.suse instead, which is more specifically designed for this distribution. Changes were contributed diff --git a/prog/init/lm_sensors.init b/prog/init/lm_sensors.init index 65dfb13c..e9454359 100755 --- a/prog/init/lm_sensors.init +++ b/prog/init/lm_sensors.init @@ -2,7 +2,7 @@ # # chkconfig: 2345 26 74 # description: sensors is used for monitoring motherboard sensor values. -# config: /etc/sysconfig/sensors +# config: /etc/sysconfig/lm_sensors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,8 +21,8 @@ # See also the lm_sensors homepage at: # http://www.lm-sensors.org -# It uses a config file /etc/sysconfig/sensors that contains the modules to -# be loaded/unloaded. That file is sourced into this one. +# It uses a config file /etc/sysconfig/lm_sensors that contains the modules +# to be loaded/unloaded. That file is sourced into this one. # The format of that file a shell script that simply defines the modules # in order as normal shell variables with the special names: diff --git a/prog/init/lm_sensors.init.suse b/prog/init/lm_sensors.init.suse index e807160c..60058c6e 100755 --- a/prog/init/lm_sensors.init.suse +++ b/prog/init/lm_sensors.init.suse @@ -13,7 +13,7 @@ ### END INIT INFO # chkconfig: 2345 26 74 # description: sensors is used for monitoring motherboard sensor values. -# config: /etc/sysconfig/sensors +# config: /etc/sysconfig/lm_sensors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -32,8 +32,8 @@ # See also the lm_sensors homepage at: # http://www.lm-sensors.org -# It uses a config file /etc/sysconfig/sensors that contains the modules to -# be loaded/unloaded. That file is sourced into this one. +# It uses a config file /etc/sysconfig/lm_sensors that contains the modules +# to be loaded/unloaded. That file is sourced into this one. # The format of that file a shell script that simply defines the modules # in order as normal shell variables with the special names: diff --git a/prog/init/lm_sensors.sysconfig b/prog/init/lm_sensors.sysconfig index 0174874a..e69de29b 100755 --- a/prog/init/lm_sensors.sysconfig +++ b/prog/init/lm_sensors.sysconfig @@ -1,38 +0,0 @@ -# This is /etc/sysconfig/lm_sensors. -# -# sensors is used for monitoring motherboard sensor values. -# -# See also the lm_sensors homepage at: -# http://www.lm-sensors.org -# -# This file is used by /etc/rc.d/init.d/lm_sensors and defines the modules to be -# loaded/unloaded. This file is sourced into /etc/rc.d/init.d/lm_sensors. - -# The format of this file is a shell script that simply defines the modules -# in order as normal variables with the special names: -# MODULE_1, MODULE_2, MODULE_3, etc. - -# -# List the modules that are to be loaded for your system -# Adapted from results of running /usr/sbin/sensors-detect -# -# Mine said (I have an ASUS K7M motherboard): -# -# #----cut here---- -# # I2C adapter drivers -# modprobe i2c-matroxfb -# # modprobe unknown adapter MAVEN:fb0 on i2c-matroxfb using Bit-shift algorithm -# # modprobe unknown adapter MAVEN:fb0 on i2c-matroxfb using Bit-shift algorithm -# modprobe i2c-isa -# # I2C chip drivers -# modprobe ddcmon -# modprobe w83781d -# modprobe via686a -# #----cut here---- -# -# Here is my module list -MODULE_0=i2c-matroxfb -MODULE_1=i2c-isa -MODULE_2=ddcmon -MODULE_3=w83781d -MODULE_4=via686a