From bbe8b9729e49501200342cf63acc1c5d71475710 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 7 Sep 2011 18:04:10 +0000 Subject: (default_packages) merge cpufreq detection logic into detect_devices::hasCPUFreq(), which is cleaner and enable us to install cpufreq on more cases --- perl-install/install/any.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'perl-install/install/any.pm') diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 623892693..8f90028c0 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -545,8 +545,7 @@ sub default_packages { push @l, "cryptsetup" if !is_empty_array_ref($o->{all_hds}{dmcrypts}); push @l, "dmraid" if any { fs::type::is_dmraid($_) } @{$o->{all_hds}{hds}}; push @l, "microcode_ctl" if detect_devices::hasCPUMicrocode(); - push @l, 'cpufreq' if cat_('/proc/cpuinfo') =~ /AuthenticAMD/ && arch() =~ /x86_64/ - || cat_('/proc/cpuinfo') =~ /model name.*Intel\(R\) Core\(TM\)2 CPU/; + push @l, 'cpufreq' if detect_devices::hasCPUFreq(); push @l, 'apmd' if -e "/proc/apm"; push @l, detect_devices::probe_name('Pkg'); -- cgit v1.2.1