summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-09-16 07:02:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-09-16 07:02:27 +0000
commit9e9acf53c642e439775ee47970d7debc9b2c3ebe (patch)
tree2e490dad352f0c2409fb99d712cca369ff65271e
parent65a2c70af3d2fa02d221e7c59f1c7619c43624be (diff)
downloaddrakx-9e9acf53c642e439775ee47970d7debc9b2c3ebe.tar
drakx-9e9acf53c642e439775ee47970d7debc9b2c3ebe.tar.gz
drakx-9e9acf53c642e439775ee47970d7debc9b2c3ebe.tar.bz2
drakx-9e9acf53c642e439775ee47970d7debc9b2c3ebe.tar.xz
drakx-9e9acf53c642e439775ee47970d7debc9b2c3ebe.zip
C3 has "cpu family" == 6, so now also checking that cmov flag is available to say we have a i686
-rw-r--r--perl-install/detect_devices.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index a50c8a524..385bbc2fa 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -784,7 +784,9 @@ sub isLaptop() {
}
sub is_i586() {
- cat_('/proc/cpuinfo') =~ /^cpu family\s*:\s*(\d+)/m && $1 < 6;
+ my $cpuinfo = cat_('/proc/cpuinfo');
+ $cpuinfo =~ /^cpu family\s*:\s*(\d+)/m && $1 < 6 ||
+ $cpuinfo !~ /^flags.*\bcmov\b/m;
}
sub matching_type {