summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-09-07 17:58:28 +0000
committerThierry Vignaud <tv@mageia.org>2011-09-07 17:58:28 +0000
commite5a279e75e243d406c9d2d7b43f021f45d519aaf (patch)
tree67515b6019ff1bfb11e170391ceec16e664c8843
parent0fe7e42179a4a8022e921f872a32eea1e33e971d (diff)
downloaddrakx-e5a279e75e243d406c9d2d7b43f021f45d519aaf.tar
drakx-e5a279e75e243d406c9d2d7b43f021f45d519aaf.tar.gz
drakx-e5a279e75e243d406c9d2d7b43f021f45d519aaf.tar.bz2
drakx-e5a279e75e243d406c9d2d7b43f021f45d519aaf.tar.xz
drakx-e5a279e75e243d406c9d2d7b43f021f45d519aaf.zip
(hasCPUFreq) fix cpufreq detection corrupting other types
-rw-r--r--perl-install/detect_devices.pm2
-rw-r--r--perl-install/install/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 117f14ed8..cb91c225a 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -1256,7 +1256,7 @@ sub hasCPUMicrocode() {
return $hasCPUMicrocode;
}
-sub hasCPUFreq() { require cpufreq; cpufreq::get_modules() }
+sub hasCPUFreq() { require cpufreq; to_bool(cpufreq::get_modules()) }
sub hasWacom() { find { $_->{vendor} == 0x056a || $_->{driver} =~ /wacom/ } usb_probe() }
sub hasTouchpad() { any { $_->{Synaptics} || $_->{ALPS} || $_->{Elantech} } getInputDevices() }
sub hasNumpad() { any { $_->{Numpad} } getInputDevices() }
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c12c1030a..747502be2 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix cpufreq detection corrupting other types
+
Version 13.62 - 22 August 2011
- always align partitions to start at megabyte boundaries to avoid