Changeset 4585

Timestamp:

07/07/07 22:04:59 (6 years ago)

Author:

khali

Message:

Cleanup the module.conf / modprobe.conf selection code.

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

@@ -2165 +2165 @@
   }
 
-  if (-f '/etc/modules.conf') {
-    $modules_conf = '/etc/modules.conf';
-  } elsif (-f '/etc/conf.modules') {
-    $modules_conf = '/etc/conf.modules';
-  } elsif (-f '/etc/modprobe.conf') {
+  if (kernel_version_at_least(2, 6, 0)) {
     $modules_conf = '/etc/modprobe.conf';
-  } else { # default
+  } else {
     $modules_conf = '/etc/modules.conf';
   }
@@ -5440 +5436 @@
   }
 
+  initialize_kernel_version();
   initialize_conf;
   initialize_proc_pci;
   initialize_modules_list;
   initialize_modules_supported;
-  initialize_kernel_version;
   initialize_cpu_list();