Changeset 5591

Timestamp:

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

Author:

khali

Message:

Don't build modprobe lines before we actually need them.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect (modified) (7 diffs)

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

@@ -5056 +5056 @@
         my ($driver, $detection, $adap);
         my ($isa, $ipmi);
-        my ($modprobes, $configfile, %bus_modules, %hwmon_modules);
+        my ($configfile, %bus_modules, %hwmon_modules);
 
         foreach $driver (keys %chips_detected) {
@@ -5105 +5105 @@
                 next unless loaded_by_us($adap->{driver});
                 next if not defined $configfile and not $adap->{used};
-                $modprobes .= "# I2C adapter drivers\n" unless defined $modprobes;
-                $modprobes .= "modprobe $adap->{driver}\n"
-                        unless exists $bus_modules{$adap->{driver}};
                 $bus_modules{$adap->{driver}}++;
         }
@@ -5114 +5111 @@
         # and will soon be gone.
         if ($isa && !kernel_version_at_least(2, 6, 18)) {
-                $modprobes .= "modprobe i2c-isa\n";
                 $bus_modules{"i2c-isa"}++;
         }
         if ($ipmi) {
-                $modprobes .= "modprobe ipmi-si\n";
                 $bus_modules{"ipmi-si"}++;
         }
 
         # Now determine the chip probe lines
-        $modprobes .= "# Chip drivers\n";
         foreach $driver (keys %chips_detected) {
                 next if not @{$chips_detected{$driver}};
@@ -5148 +5142 @@
                                       "driver availability.\n\n";
                         } else {
-                                $modprobes .= "modprobe $driver\n";
                                 $hwmon_modules{$driver}++;
                         }
@@ -5156 +5149 @@
         my @bus_modules = sort keys %bus_modules;
         my @hwmon_modules = sort keys %hwmon_modules;
-        return ($modprobes, $configfile, \@bus_modules, \@hwmon_modules);
+        return ($configfile, \@bus_modules, \@hwmon_modules);
 }
 
 sub write_config
 {
-        my ($modprobes, $configfile, $bus_modules, $hwmon_modules) = @_;
+        my ($configfile, $bus_modules, $hwmon_modules) = @_;
 
         if (defined $configfile) {
@@ -5246 +5239 @@
                 print "To load everything that is needed, add this to one of the system\n".
                       "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n";
-                print "#----cut here----\n".
-                      $modprobes.
-                      (-e '/usr/bin/sensors' ?
+                print "#----cut here----\n";
+                if (@{$bus_modules}) {
+                        print "# Adapter drivers\n";
+                        print "modprobe $_\n" foreach (@{$bus_modules});
+                }
+                print "# Chip drivers\n";
+                print "modprobe $_\n" foreach (@{$hwmon_modules});
+                print((-e '/usr/bin/sensors' ?
                        "/usr/bin/sensors -s\n" :
                        "/usr/local/bin/sensors -s\n").
-                      "#----cut here----\n\n";
+                      "#----cut here----\n\n");
 
                 print "If you have some drivers built into your kernel, the list above will\n".
@@ -5409 +5407 @@
         print "\n";
 
-        my ($modprobes, $configfile, $bus_modules, $hwmon_modules) = generate_modprobes();
+        my ($configfile, $bus_modules, $hwmon_modules) = generate_modprobes();
 
         if (@{$hwmon_modules}) {
-                write_config($modprobes, $configfile, $bus_modules, $hwmon_modules);
+                write_config($configfile, $bus_modules, $hwmon_modules);
         } else {
                 print "No modules to load, skipping modules configuration.\n\n";