Changeset 5589

Timestamp:

01/12/09 17:13:55 (4 years ago)

Author:

khali

Message:

Move configuration files generation to a dedicated sub.

Files:

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

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

@@ -5158 +5158 @@
 }
 
-sub main
-{
-        my ($input, $superio_features);
-
-        # Handle special command line cases first
-        if (defined $ARGV[0] && $ARGV[0] eq "--stat") {
-                show_i2c_stats();
-                exit 0;
-        }
-
-        # We won't go very far if not root
-        unless ($> == 0) {
-                print "You need to be root to run this script.\n";
-                exit -1;
-        }
-
-        if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
-            -f "/var/lock/subsys/lm_sensors") {
-                system("/sbin/service", "lm_sensors", "stop");
-        }
-
-        initialize_kernel_version();
-        initialize_conf();
-        initialize_pci();
-        initialize_modules_list();
-        # Make sure any special case chips are added to the chip_ids list
-        # before making the support modules list
-        chip_special_cases();
-        initialize_modules_supported();
-        initialize_cpu_list();
-
-        print "# sensors-detect revision $revision\n";
-        initialize_dmi_data();
-        print_dmi_summary();
-        print "\n";
-        print "This program will help you determine which kernel modules you need\n",
-              "to load to use lm_sensors most effectively. It is generally safe\n",
-              "and recommended to accept the default answers to all questions,\n",
-              "unless you know what you're doing.\n\n";
-
-        print "Some south bridges, CPUs or memory controllers contain embedded sensors.\n".
-              "Do you want to scan for them? This is totally safe. (YES/no): ";
-        unless (<STDIN> =~ /^\s*n/i) {
-                $| = 1;
-                foreach my $entry (@cpu_ids) {
-                        scan_cpu($entry);
-                }
-                $| = 0;
-        }
-        print "\n";
-
-        $superio_features = 0;
-        # Skip "random" I/O port probing on PPC
-        if ($kernel_arch ne 'ppc'
-         && $kernel_arch ne 'ppc64') {
-                print "Some Super I/O chips contain embedded sensors. We have to write to\n".
-                      "standard I/O ports to probe them. This is usually safe.\n";
-                print "Do you want to scan for Super I/O sensors? (YES/no): ";
-                unless (<STDIN> =~ /^\s*n/i) {
-                        initialize_ioports();
-                        $superio_features |= scan_superio(0x2e, 0x2f);
-                        $superio_features |= scan_superio(0x4e, 0x4f);
-                        close_ioports();
-                }
-                print "\n";
-
-                unless (is_laptop()) {
-                        print "Some systems (mainly servers) implement IPMI, a set of common interfaces\n".
-                              "through which system health data may be retrieved, amongst other things.\n".
-                              "We have to read from arbitrary I/O ports to probe for such interfaces.\n".
-                              "This is normally safe. Do you want to scan for IPMI interfaces?\n".
-                              "(YES/no): ";
-                        unless (<STDIN> =~ /^\s*n/i) {
-                                initialize_ioports();
-                                scan_isa_bus(\@ipmi_ifs);
-                                close_ioports();
-                        }
-                        print "\n";
-                }
-
-                printf "Some hardware monitoring chips are accessible through the ISA I/O ports.\n".
-                       "We have to write to arbitrary I/O ports to probe them. This is usually\n".
-                       "safe though. Yes, you do have ISA I/O ports even if you do not have any\n".
-                       "ISA slots! Do you want to scan the ISA I/O ports? (\%s): ",
-                       $superio_features ? "yes/NO" : "YES/no";
-                $input = <STDIN>;
-                unless ($input =~ /^\s*n/i
-                     || ($superio_features && $input !~ /^\s*y/i)) {
-                        initialize_ioports();
-                        scan_isa_bus(\@chip_ids);
-                        close_ioports();
-                }
-                print "\n";
-        }
-
-        print "Lastly, we can probe the I2C/SMBus adapters for connected hardware\n".
-              "monitoring devices. This is the most risky part, and while it works\n".
-              "reasonably well on most systems, it has been reported to cause trouble\n".
-              "on some systems.\n".
-              "Do you want to probe the I2C/SMBus adapters now? (YES/no): ";
-
-        unless (<STDIN> =~ /^\s*n/i) {
-                adapter_pci_detection();
-                load_module("i2c-dev") unless -e "$sysfs_root/class/i2c-dev";
-                initialize_i2c_adapters_list();
-                $i2c_addresses_to_scan = i2c_addresses_to_scan();
-                print "\n";
-
-                # Skip SMBus probing by default if Super-I/O has all the features
-                my $by_default = ~$superio_features & (FEAT_IN | FEAT_FAN | FEAT_TEMP);
-                # Except on Asus and Tyan boards which often have more than
-                # one hardware monitoring chip
-                $by_default = 1 if dmi_match('board_vendor', 'asustek', 'tyan',
-                                             'supermicro');
-
-                for (my $dev_nr = 0; $dev_nr < @i2c_adapters; $dev_nr++) {
-                        next unless exists $i2c_adapters[$dev_nr];
-                        scan_i2c_adapter($dev_nr, $by_default);
-                }
-        }
-
-        if (!keys %chips_detected) {
-                print "Sorry, no sensors were detected.\n";
-                if (is_laptop() && -d "$sysfs_root/firmware/acpi") {
-                        print "This is relatively common on laptops, where thermal management is\n".
-                              "handled by ACPI rather than the OS.\n";
-                } else {
-                        print "Either your system has no sensors, or they are not supported, or\n".
-                              "they are connected to an I2C or SMBus adapter that is not\n".
-                              "supported. If you find out what chips are on your board, check\n".
-                              "http://www.lm-sensors.org/wiki/Devices for driver status.\n";
-                }
-                exit;
-        }
-
-        print "Now follows a summary of the probes I have just done.\n".
-              "Just press ENTER to continue: ";
-        <STDIN>;
-
-        foreach my $driver (keys %chips_detected) {
-                next unless @{$chips_detected{$driver}};
-                find_aliases($chips_detected{$driver});
-                print "\nDriver `$driver':\n";
-                print_chips_report($chips_detected{$driver});
-        }
-        print "\n";
-
-        my ($modprobes, $configfile, $bus_modules, $hwmon_modules) = generate_modprobes();
+sub write_config
+{
+        my ($modprobes, $configfile, $bus_modules, $hwmon_modules) = @_;
 
         if (defined $configfile) {
@@ -5404 +5259 @@
         }
 
+}
+
+sub main
+{
+        my ($input, $superio_features);
+
+        # Handle special command line cases first
+        if (defined $ARGV[0] && $ARGV[0] eq "--stat") {
+                show_i2c_stats();
+                exit 0;
+        }
+
+        # We won't go very far if not root
+        unless ($> == 0) {
+                print "You need to be root to run this script.\n";
+                exit -1;
+        }
+
+        if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
+            -f "/var/lock/subsys/lm_sensors") {
+                system("/sbin/service", "lm_sensors", "stop");
+        }
+
+        initialize_kernel_version();
+        initialize_conf();
+        initialize_pci();
+        initialize_modules_list();
+        # Make sure any special case chips are added to the chip_ids list
+        # before making the support modules list
+        chip_special_cases();
+        initialize_modules_supported();
+        initialize_cpu_list();
+
+        print "# sensors-detect revision $revision\n";
+        initialize_dmi_data();
+        print_dmi_summary();
+        print "\n";
+        print "This program will help you determine which kernel modules you need\n",
+              "to load to use lm_sensors most effectively. It is generally safe\n",
+              "and recommended to accept the default answers to all questions,\n",
+              "unless you know what you're doing.\n\n";
+
+        print "Some south bridges, CPUs or memory controllers contain embedded sensors.\n".
+              "Do you want to scan for them? This is totally safe. (YES/no): ";
+        unless (<STDIN> =~ /^\s*n/i) {
+                $| = 1;
+                foreach my $entry (@cpu_ids) {
+                        scan_cpu($entry);
+                }
+                $| = 0;
+        }
+        print "\n";
+
+        $superio_features = 0;
+        # Skip "random" I/O port probing on PPC
+        if ($kernel_arch ne 'ppc'
+         && $kernel_arch ne 'ppc64') {
+                print "Some Super I/O chips contain embedded sensors. We have to write to\n".
+                      "standard I/O ports to probe them. This is usually safe.\n";
+                print "Do you want to scan for Super I/O sensors? (YES/no): ";
+                unless (<STDIN> =~ /^\s*n/i) {
+                        initialize_ioports();
+                        $superio_features |= scan_superio(0x2e, 0x2f);
+                        $superio_features |= scan_superio(0x4e, 0x4f);
+                        close_ioports();
+                }
+                print "\n";
+
+                unless (is_laptop()) {
+                        print "Some systems (mainly servers) implement IPMI, a set of common interfaces\n".
+                              "through which system health data may be retrieved, amongst other things.\n".
+                              "We have to read from arbitrary I/O ports to probe for such interfaces.\n".
+                              "This is normally safe. Do you want to scan for IPMI interfaces?\n".
+                              "(YES/no): ";
+                        unless (<STDIN> =~ /^\s*n/i) {
+                                initialize_ioports();
+                                scan_isa_bus(\@ipmi_ifs);
+                                close_ioports();
+                        }
+                        print "\n";
+                }
+
+                printf "Some hardware monitoring chips are accessible through the ISA I/O ports.\n".
+                       "We have to write to arbitrary I/O ports to probe them. This is usually\n".
+                       "safe though. Yes, you do have ISA I/O ports even if you do not have any\n".
+                       "ISA slots! Do you want to scan the ISA I/O ports? (\%s): ",
+                       $superio_features ? "yes/NO" : "YES/no";
+                $input = <STDIN>;
+                unless ($input =~ /^\s*n/i
+                     || ($superio_features && $input !~ /^\s*y/i)) {
+                        initialize_ioports();
+                        scan_isa_bus(\@chip_ids);
+                        close_ioports();
+                }
+                print "\n";
+        }
+
+        print "Lastly, we can probe the I2C/SMBus adapters for connected hardware\n".
+              "monitoring devices. This is the most risky part, and while it works\n".
+              "reasonably well on most systems, it has been reported to cause trouble\n".
+              "on some systems.\n".
+              "Do you want to probe the I2C/SMBus adapters now? (YES/no): ";
+
+        unless (<STDIN> =~ /^\s*n/i) {
+                adapter_pci_detection();
+                load_module("i2c-dev") unless -e "$sysfs_root/class/i2c-dev";
+                initialize_i2c_adapters_list();
+                $i2c_addresses_to_scan = i2c_addresses_to_scan();
+                print "\n";
+
+                # Skip SMBus probing by default if Super-I/O has all the features
+                my $by_default = ~$superio_features & (FEAT_IN | FEAT_FAN | FEAT_TEMP);
+                # Except on Asus and Tyan boards which often have more than
+                # one hardware monitoring chip
+                $by_default = 1 if dmi_match('board_vendor', 'asustek', 'tyan',
+                                             'supermicro');
+
+                for (my $dev_nr = 0; $dev_nr < @i2c_adapters; $dev_nr++) {
+                        next unless exists $i2c_adapters[$dev_nr];
+                        scan_i2c_adapter($dev_nr, $by_default);
+                }
+        }
+
+        if (!keys %chips_detected) {
+                print "Sorry, no sensors were detected.\n";
+                if (is_laptop() && -d "$sysfs_root/firmware/acpi") {
+                        print "This is relatively common on laptops, where thermal management is\n".
+                              "handled by ACPI rather than the OS.\n";
+                } else {
+                        print "Either your system has no sensors, or they are not supported, or\n".
+                              "they are connected to an I2C or SMBus adapter that is not\n".
+                              "supported. If you find out what chips are on your board, check\n".
+                              "http://www.lm-sensors.org/wiki/Devices for driver status.\n";
+                }
+                exit;
+        }
+
+        print "Now follows a summary of the probes I have just done.\n".
+              "Just press ENTER to continue: ";
+        <STDIN>;
+
+        foreach my $driver (keys %chips_detected) {
+                next unless @{$chips_detected{$driver}};
+                find_aliases($chips_detected{$driver});
+                print "\nDriver `$driver':\n";
+                print_chips_report($chips_detected{$driver});
+        }
+        print "\n";
+
+        my ($modprobes, $configfile, $bus_modules, $hwmon_modules) = generate_modprobes();
+        write_config($modprobes, $configfile, $bus_modules, $hwmon_modules);
+
         unload_modules();
 }