Changeset 5590

Timestamp:

01/12/09 17:17:51 (4 years ago)

Author:

khali

Message:

Print warnings about missing modules on screen, rather than telling
the user to add them to the configuration files. When using the
sysconfig integration mode, the warnings would never be seen.
Also don't include missing modules in the configuration files,
as they may cause the lm_sensors service to fail.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• prog/detect/sensors-detect (modified) (4 diffs)

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

@@ -55 +55 @@
                   Add Intel Core I7 support
                   Generate new format for /etc/sysconfig/lm_sensors
+                  Print warnings about missing modules on screen
   sensors-detect-stat.pl: Delete (functionality merged into sensors-detect)
 

lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect

@@ -5118 +5118 @@
         }
         if ($ipmi) {
-                $modprobes .= "# You must also install and load the IPMI modules\n";
                 $modprobes .= "modprobe ipmi-si\n";
                 $bus_modules{"ipmi-si"}++;
@@ -5128 +5127 @@
                 next if not @{$chips_detected{$driver}};
                 if ($driver eq "to-be-written") {
-                        $modprobes .= "# no driver for ${$chips_detected{$driver}}[0]{chipname} yet\n";
+                        print "Note: there is no driver for ${$chips_detected{$driver}}[0]{chipname} yet.\n".
+                              "Check http://www.lm-sensors.org/wiki/Devices for updates.\n\n";
                 } else {
                         open(local *INPUTFILE, "modprobe -l $driver 2>/dev/null |");
@@ -5143 +5143 @@
                         # isn't supported
                         if ((($? >> 8) == 0) && ! $modulefound) {
-                                $modprobes .= "# Warning: the required module $driver is not currently installed\n".
-                                              "# on your system. For status of 2.6 kernel ports check\n".
-                                              "# http://www.lm-sensors.org/wiki/Devices. If driver is built\n".
-                                              "# into the kernel, or unavailable, comment out the following line.\n";
+                                print "Warning: the required module $driver is not currently installed\n".
+                                      "on your system. If it is built into the kernel then it's OK.\n".
+                                      "Otherwise, check http://www.lm-sensors.org/wiki/Devices for\n".
+                                      "driver availability.\n\n";
+                        } else {
+                                $modprobes .= "modprobe $driver\n";
+                                $hwmon_modules{$driver}++;
                         }
-                        $modprobes .= "modprobe $driver\n";
-                        $hwmon_modules{$driver}++;
                 }
         }
@@ -5409 +5410 @@
 
         my ($modprobes, $configfile, $bus_modules, $hwmon_modules) = generate_modprobes();
-        write_config($modprobes, $configfile, $bus_modules, $hwmon_modules);
+
+        if (@{$hwmon_modules}) {
+                write_config($modprobes, $configfile, $bus_modules, $hwmon_modules);
+        } else {
+                print "No modules to load, skipping modules configuration.\n\n";
+        }
 
         unload_modules();