summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-20 15:24:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-20 15:24:29 +0000
commit575726c46f9e4ff3e686afc0c1f1cb7ff1cbda5f (patch)
tree69c9d5dfcd8c153f4a484a7b281596000db5e93b
parent4c0e8bc9d01fead5c1579cecc1809ded8222ae67 (diff)
downloaddrakx-575726c46f9e4ff3e686afc0c1f1cb7ff1cbda5f.tar
drakx-575726c46f9e4ff3e686afc0c1f1cb7ff1cbda5f.tar.gz
drakx-575726c46f9e4ff3e686afc0c1f1cb7ff1cbda5f.tar.bz2
drakx-575726c46f9e4ff3e686afc0c1f1cb7ff1cbda5f.tar.xz
drakx-575726c46f9e4ff3e686afc0c1f1cb7ff1cbda5f.zip
fix previous commit (thanks to titi)
-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 f8e553430..3e057d28f 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -987,7 +987,7 @@ sub get_mac_generation() {
sub hasSMP() {
return if $::testing;
(any { /NR_CPUS limit of 1 reached/ } syslog()) ||
- (any { /^processor\s*:\s*(\d+)/ && $1 > 0 } syslog()) ||
+ (any { /^processor\s*:\s*(\d+)/ && $1 > 0 } cat_('/proc/cpuinfo')) ||
any { /\bProcessor #(\d+)\s+(\S*)/ && $1 > 0 && $2 ne 'invalid' } syslog();
}
sub hasPCMCIA() { $::o->{pcmcia} } #- because /proc/pcmcia seems not to be present on 2.4 at least (or use /var/run/stab)