Changeset 4990 for lm-sensors/branches/lm-sensors-3.0.0/lib/init.c

Timestamp:

10/25/07 11:59:05 (5 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".

Files:

• lm-sensors/branches/lm-sensors-3.0.0/lib/init.c (modified) (3 diffs)

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) ||