mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-08-31 06:15:15 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4585 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2007-07-07 20:04:59 +00:00
parent 15f1274aef
commit d33285b3b0
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
prog/detect/sensors-detect
View File

@@ -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";