Changeset 4990

Timestamp:

10/25/07 11:59:05 (4 years ago)

Author:

khali

Message:

Use /etc/sensors3.conf as the default configuration file. If it can't
be found, fallback to /etc/sensors.conf. This allows for an old
libsensors and a new libsensors to be installed in parallel, and each
one has its own configuration file.

One important change here is that the default configuration file will
be installed as /etc/sensors3.conf by "make install".

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (2 diffs)
• INSTALL (modified) (1 diff)
• doc/fan-divisors (modified) (2 diffs)
• etc/Module.mk (modified) (1 diff)
• etc/sensors-conf-convert (modified) (1 diff)
• lib/init.c (modified) (3 diffs)
• lib/libsensors.3 (modified) (1 diff)
• lib/sensors.conf.5 (modified) (2 diffs)
• prog/sensord/sensord.8 (modified) (1 diff)
• prog/sensors/sensors.1 (modified) (1 diff)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -6 +6 @@
               Fix memory leaks on initialization error
               Make the configuration file optional
+              Change the default configuration file to /etc/sensors3.conf
   sensord: Reload config on SIGHUP rather than automatically
            No default configuration file name
@@ -11 +12 @@
            Handle the case where voltage measurements aren't available
            No default configuration file name
+  sensors.conf.eg: Install as sensors3.conf
   sensors-detect: Fix SMSC LPC47B357/M967 detection
                   Select the right driver for FSC chips

lm-sensors/branches/lm-sensors-3.0.0/INSTALL

@@ -72 +72 @@
 
 The initial output of `sensors' will not be perfect. You have to adjust
-the configuration file (/etc/sensors.conf) to match your motherboard.
+the configuration file (/etc/sensors3.conf) to match your motherboard.
 This includes (re)labelling inputs, ignoring unused inputs, changing
 voltage compute lines and setting limits. Write down all the sensor

lm-sensors/branches/lm-sensors-3.0.0/doc/fan-divisors

@@ -48 +48 @@
 
 Put an entry "set fanN_div X" in the appropriate section of
-/etc/sensors.conf and run 'sensors -s'
+/etc/sensors3.conf and run 'sensors -s'
 (N is the number of the fan, and X is the divisor you want).
 
@@ -88 +88 @@
 As we learned above, you can _not_ fix this by changing
 the fan divisor. You must add entries into the appropriate
-section of /etc/sensors.conf:
+section of /etc/sensors3.conf:
 
         compute fanN  @/2,  2*@

lm-sensors/branches/lm-sensors-3.0.0/etc/Module.mk

@@ -22 +22 @@
 
 ETCTARGET := $(MODULE_DIR)/sensors.conf.eg
-ETCINSTALL := $(ETCDIR)/sensors.conf
+ETCINSTALL := $(ETCDIR)/sensors3.conf
 
 

lm-sensors/branches/lm-sensors-3.0.0/etc/sensors-conf-convert

@@ -368 +368 @@
         if (defined $ARGV[0] && ($ARGV[0] eq '-h' || $ARGV[0] eq '--help')) {
                 print "Convert sensors.conf from lm-sensors 2 format to lm-sensors 3 format\n",
-                      "Typical usage: sensors-conf-convert /etc/sensors.conf\n";
+                      "Typical usage: sensors-conf-convert < /etc/sensors.conf > /etc/sensors3.conf\n";
                 exit 0;
         }

lm-sensors/branches/lm-sensors-3.0.0/lib/init.c

@@ -21 +21 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <errno.h>
 #include "sensors.h"
 #include "data.h"
@@ -30 +31 @@
 #include "init.h"
 
-#define DEFAULT_CONFIG_FILE     ETCDIR "/sensors.conf"
+#define DEFAULT_CONFIG_FILE     ETCDIR "/sensors3.conf"
+#define ALT_CONFIG_FILE         ETCDIR "/sensors.conf"
 
 int sensors_init(FILE *input)
@@ -50 +52 @@
                 /* No configuration provided, use default */
                 input = fopen(DEFAULT_CONFIG_FILE, "r");
+                if (!input && errno == ENOENT)
+                        input = fopen(ALT_CONFIG_FILE, "r");
                 if (input) {
                         if (sensors_scanner_init(input) ||

lm-sensors/branches/lm-sensors-3.0.0/lib/libsensors.3

@@ -173 +173 @@
 
 .SH FILES
+.I /etc/sensors3.conf
+.br
 .I /etc/sensors.conf
 .RS
 The system-wide
 .BR libsensors (3)
-configuration file.
+configuration file. /etc/sensors3.conf is tried first, and if it doesn't exist,
+/etc/sensors.conf is used instead.
 
 .SH SEE ALSO

lm-sensors/branches/lm-sensors-3.0.0/lib/sensors.conf.5

@@ -24 +24 @@
 .\" References consulted:
 .\"     sensors.conf.eg by Frodo Looijaard
-.TH sensors.conf 5  "September 2007" "lm-sensors 3" "Linux User's Manual"
+.TH sensors.conf 5  "October 2007" "lm-sensors 3" "Linux User's Manual"
 .SH NAME
 sensors.conf \- libsensors configuration file
@@ -395 +395 @@
 that one takes always precedence.
 
+.SH FILES
+.I /etc/sensors3.conf
+.br
+.I /etc/sensors.conf
+.RS
+The system-wide
+.BR libsensors (3)
+configuration file. /etc/sensors3.conf is tried first, and if it doesn't exist,
+/etc/sensors.conf is used instead.
+
 .SH SEE ALSO
 libsensors(3)

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sensord.8

@@ -361 +361 @@
 multiple sensor chips having duplicate sensor labels.
 .SH FILES
+.I /etc/sensors3.conf
+.br
 .I /etc/sensors.conf
 .RS

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/sensors.1

@@ -75 +75 @@
 than numbers.
 .SH FILES
+.I /etc/sensors3.conf
+.br
 .I /etc/sensors.conf
 .RS