Changeset 4585

Show
Ignore:
Timestamp:
07/07/07 22:04:59 (7 years ago)
Author:
khali
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect

    r4572 r4585  
    21652165  } 
    21662166 
    2167   if (-f '/etc/modules.conf') { 
    2168     $modules_conf = '/etc/modules.conf'; 
    2169   } elsif (-f '/etc/conf.modules') { 
    2170     $modules_conf = '/etc/conf.modules'; 
    2171   } elsif (-f '/etc/modprobe.conf') { 
     2167  if (kernel_version_at_least(2, 6, 0)) { 
    21722168    $modules_conf = '/etc/modprobe.conf'; 
    2173   } else { # default 
     2169  } else { 
    21742170    $modules_conf = '/etc/modules.conf'; 
    21752171  } 
     
    54405436  } 
    54415437 
     5438  initialize_kernel_version(); 
    54425439  initialize_conf; 
    54435440  initialize_proc_pci; 
    54445441  initialize_modules_list; 
    54455442  initialize_modules_supported; 
    5446   initialize_kernel_version; 
    54475443  initialize_cpu_list(); 
    54485444