diff options
author | Thierry Vignaud <tv@mageia.org> | 2011-09-07 18:04:10 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2011-09-07 18:04:10 +0000 |
commit | df3ee1409d4a54eab82bd7e0c7679deb7547e45e (patch) | |
tree | f316440582f9a63cb483381109da95e6985a43e0 /perl-install/detect_devices.pm | |
parent | 5e8989abdbf94bd7acc22b027e389daca3b74af2 (diff) | |
download | drakx-df3ee1409d4a54eab82bd7e0c7679deb7547e45e.tar drakx-df3ee1409d4a54eab82bd7e0c7679deb7547e45e.tar.gz drakx-df3ee1409d4a54eab82bd7e0c7679deb7547e45e.tar.bz2 drakx-df3ee1409d4a54eab82bd7e0c7679deb7547e45e.tar.xz drakx-df3ee1409d4a54eab82bd7e0c7679deb7547e45e.zip |
(default_packages) merge cpufreq detection logic into
detect_devices::hasCPUFreq(), which is cleaner and enable us to install
cpufreq on more cases
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r-- | perl-install/detect_devices.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 49ed09cab..3ad459054 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -1254,7 +1254,12 @@ sub hasCPUMicrocode() { return $hasCPUMicrocode; } -sub hasCPUFreq() { require cpufreq; to_bool(cpufreq::get_modules()) } +sub hasCPUFreq() { + require cpufreq; + to_bool(cpufreq::get_modules()) + || cat_('/proc/cpuinfo') =~ /AuthenticAMD/ && arch() =~ /x86_64/ + || cat_('/proc/cpuinfo') =~ /model name.*Intel\(R\) Core\(TM\)2 CPU/; +} sub hasWacom() { find { $_->{vendor} == 0x056a || $_->{driver} =~ /wacom/ } usb_probe() } sub hasTouchpad() { any { $_->{Synaptics} || $_->{ALPS} || $_->{Elantech} } getInputDevices() } sub hasNumpad() { any { $_->{Numpad} } getInputDevices() } |