summaryrefslogtreecommitdiffstats
path: root/perl-install/detect_devices.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-01-10 14:52:39 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-01-10 14:52:39 +0000
commitfbdcdd6c198149aebccb5cd7068ec5bf74c4012d (patch)
tree6f2540e155ec39ce377a9479b5d2f7e22dd305db /perl-install/detect_devices.pm
parent889b45e9b47c6b3f68774ad73debc5baf1b7087f (diff)
downloaddrakx-fbdcdd6c198149aebccb5cd7068ec5bf74c4012d.tar
drakx-fbdcdd6c198149aebccb5cd7068ec5bf74c4012d.tar.gz
drakx-fbdcdd6c198149aebccb5cd7068ec5bf74c4012d.tar.bz2
drakx-fbdcdd6c198149aebccb5cd7068ec5bf74c4012d.tar.xz
drakx-fbdcdd6c198149aebccb5cd7068ec5bf74c4012d.zip
look for "NR_CPUS limit of 1 reached" instead of looking MP tables by hand, or using DMI info (often broken)
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r--perl-install/detect_devices.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index c33fb80ac..15075b8a3 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -889,7 +889,8 @@ sub get_mac_generation() {
sub hasSMP() {
return if $::testing;
- c::detectSMP() || any { /\bProcessor #(\d+)\s+(\S*)/ && $1 > 0 && $2 ne 'invalid' } syslog();
+ any { /NR_CPUS limit of 1 reached/ } syslog() ||
+ 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)