From da9732f7bf19f7c4ede4200632abf823eed66a1c Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Wed, 6 Feb 2008 14:01:28 +0000 Subject: match model name only when grepping /proc/cpuinfo in isLaptop() --- perl-install/detect_devices.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()); -- cgit v1.2.1