Changeset 5528

Timestamp:

12/05/08 18:58:47 (4 years ago)

Author:

khali

Message:

Suggest installing dmidecode if needed and missing.

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

@@ -2159 +2159 @@
         } else {
                 # Else fallback on calling dmidecode
-                return unless open(local *DMIDECODE,
-                                   "dmidecode --version 2>/dev/null |");
-                my $version = <DMIDECODE>;
-                close(DMIDECODE);
-                return unless defined $version;
-
-                # We need at least version 2.7
-                chomp $version;
-                return unless $version =~ m/^(\d+).(\d+)$/;
-                return unless (($1 == 2 && $2 >= 7) || $1 > 2);
+                my $version;
+                if (open(local *DMIDECODE, "dmidecode --version 2>/dev/null |")) {
+                        $version = <DMIDECODE>;
+                        close(DMIDECODE);
+                        chomp $version if defined $version;
+                }
+
+                if (!defined $version
+                 || !($version =~ m/^(\d+).(\d+)$/)
+                 || !(($1 == 2 && $2 >= 7) || $1 > 2)) {
+                        print "# DMI data unavailable, please consider installing dmidecode 2.7\n".
+                              "# or later for better results.\n";
+                        return;
+                }
 
                 foreach my $k (keys %items) {
@@ -5152 +5156 @@
         initialize_modules_supported();
         initialize_cpu_list();
+
+        print "# sensors-detect revision $revision\n";
         initialize_dmi_data();
-
-        print "# sensors-detect revision $revision\n";
         print_dmi_summary();
         print "\n";