From cc286d309161ebbb588eaa86a44246ebcb40fcc6 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sat, 7 Jul 2007 19:56:58 +0000
Subject: [PATCH] Cleanup the module.conf / modprobe.conf selection code.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4584 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 prog/detect/sensors-detect | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index dbf60131..4996bf6b 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -2164,13 +2164,9 @@ sub initialize_conf
     }
   }
 
-  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';
   }
 
@@ -5439,11 +5435,11 @@ sub main
     exit -1;
   }
 
+  initialize_kernel_version();
   initialize_conf;
   initialize_proc_pci;
   initialize_modules_list;
   initialize_modules_supported;
-  initialize_kernel_version;
   initialize_cpu_list();
 
   print "# sensors-detect revision $revision\n\n";