Changeset 5502

Timestamp:

12/02/08 21:56:45 (4 years ago)

Author:

khali

Message:

Add an option to skip ISA probes except IPMI. The idea is that only
old systems have ISA hardware monitoring chips, while IPMI can be
present on recent systems. Additionally, IPMI probing is read-only,
so it's safer than other ISA probes.

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

@@ -35 +35 @@
                   Move alias detection after all chip detections
                   Probe chip types from safest to more risky (#2322)
+                  Add an option to skip ISA probes except IPMI
 
 3.0.3 (2008-09-28)

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

@@ -2778 +2778 @@
 sub scan_isa_bus
 {
+        my $ipmi_only = shift;
         my ($chip, $addr, $conf);
 
@@ -2783 +2784 @@
         foreach $chip (@chip_ids) {
                 next if not exists $chip->{isa_addrs} or not exists $chip->{isa_detect};
+                next if $ipmi_only && $chip->{name} !~ m/\bIPMI\b/;
                 foreach $addr (@{$chip->{isa_addrs}}) {
                         printf("\%-60s", sprintf("Probing for `\%s'\ at 0x\%x... ",
@@ -4868 +4870 @@
 sub main
 {
+        my ($input);
+
         # We won't go very far if not root
         unless ($> == 0) {
@@ -4923 +4927 @@
                       "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? (YES/no): ";
-                unless (<STDIN> =~ /^\s*n/i) {
+                      "ISA slots! Do you want to scan the ISA I/O ports? (YES/no/ipmi only): ";
+                $input = <STDIN>;
+                unless ($input =~ /^\s*n/i) {
                         initialize_ioports();
-                        scan_isa_bus();
+                        scan_isa_bus($input =~ /^\s*i/i);
                         close_ioports();
                 }