summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-02-06 14:01:28 +0000
committerOlivier Blin <oblin@mandriva.com>2008-02-06 14:01:28 +0000
commitda9732f7bf19f7c4ede4200632abf823eed66a1c (patch)
tree95af9818a386e77f490219b7a7c0d851adfaf4d5
parenta73036e165070565342d7129384e82025a247c7a (diff)
downloaddrakx-da9732f7bf19f7c4ede4200632abf823eed66a1c.tar
drakx-da9732f7bf19f7c4ede4200632abf823eed66a1c.tar.gz
drakx-da9732f7bf19f7c4ede4200632abf823eed66a1c.tar.bz2
drakx-da9732f7bf19f7c4ede4200632abf823eed66a1c.tar.xz
drakx-da9732f7bf19f7c4ede4200632abf823eed66a1c.zip
match model name only when grepping /proc/cpuinfo in isLaptop()
-rw-r--r--perl-install/detect_devices.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 8f2de29de..1ba92f600 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -1046,7 +1046,7 @@ sub isLaptop() {
matching_desc__regexp('ViRGE.MX') || matching_desc__regexp('S3.*Savage.*[IM]X') ||
matching_desc__regexp('Intel Corporation\|Mobile') ||
matching_desc__regexp('\bATI\b.*(Mobility|\bLT\b)'))
- || cat_('/proc/cpuinfo') =~ /\bmobile\b/i
+ || (any { $_->{'model name'} =~ /\bmobile\b/i } getCPUs())
|| probe_unique_name("Type") eq 'laptop'
#- ipw2100/2200/3945 are Mini-PCI (Express) adapters
|| (any { member($_->{driver}, qw(ipw2100 ipw2200 ipw3945)) } pci_probe());