summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2002-11-05 18:33:37 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2002-11-05 18:33:37 +0000
commit7529eee43fe1f250fb3f81a45c6140a62a348656 (patch)
tree3cedea45e9c080adda3df56ad36453b50c0c0e20
parentd22ee938d657bd2cbcb66b508ba1883b55780b3b (diff)
downloaddrakx-7529eee43fe1f250fb3f81a45c6140a62a348656.tar
drakx-7529eee43fe1f250fb3f81a45c6140a62a348656.tar.gz
drakx-7529eee43fe1f250fb3f81a45c6140a62a348656.tar.bz2
drakx-7529eee43fe1f250fb3f81a45c6140a62a348656.tar.xz
drakx-7529eee43fe1f250fb3f81a45c6140a62a348656.zip
Detect SMP more easily if we have APIC stuff capable
-rw-r--r--perl-install/detect_devices.pm10
1 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index c60e356c2..05e7eaccb 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -478,7 +478,15 @@ sub get_mac_generation() {
return "Unknown Generation";
}
-sub hasSMP { c::detectSMP() }
+sub hasSMP {
+ # Much simpler if we have APIC stuff
+ foreach (syslog()) {
+ my ($nprocs) = m/Processors: (\d+)/ or next;
+ return $nprocs > 1 ? 1 : 0;
+ }
+ c::detectSMP()
+}
+
sub hasPCMCIA { $::o->{pcmcia} } #- because /proc/pcmcia seems not to be present on 2.4 at least (or use /var/run/stab)
#- try to detect a laptop, we assume pcmcia service is an indication of a laptop or