summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-01-10 14:55:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-01-10 14:55:09 +0000
commite1707b82b47a732ce2928da268b6db83fdad984e (patch)
tree61889096c026b52cc9a001d3c6af68eef4a8dbd5
parent91a658560a73a5fd34df1fa797cbf0d7eebd680c (diff)
downloaddrakx-backup-do-not-use-e1707b82b47a732ce2928da268b6db83fdad984e.tar
drakx-backup-do-not-use-e1707b82b47a732ce2928da268b6db83fdad984e.tar.gz
drakx-backup-do-not-use-e1707b82b47a732ce2928da268b6db83fdad984e.tar.bz2
drakx-backup-do-not-use-e1707b82b47a732ce2928da268b6db83fdad984e.tar.xz
drakx-backup-do-not-use-e1707b82b47a732ce2928da268b6db83fdad984e.zip
look for "NR_CPUS limit of 1 reached" instead of looking MP tables by hand, or using DMI info (often broken)
-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 41ae7181f..a067d97cd 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -873,7 +873,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)