summaryrefslogtreecommitdiffstats
path: root/perl-install/detect_devices.pm
diff options
context:
space:
mode:
authorMystery Man <unknown@mandriva.org>2003-04-17 14:51:14 +0000
committerMystery Man <unknown@mandriva.org>2003-04-17 14:51:14 +0000
commitef016519fadd0d52908858470a704cce6a8ceeff (patch)
tree7dda80ef3508a0b6422cc2ea34ce1d933b81f2a4 /perl-install/detect_devices.pm
parent327bd24f8e4291bd1882de1990dd7339f781a9cb (diff)
downloaddrakx-backup-do-not-use-ef016519fadd0d52908858470a704cce6a8ceeff.tar
drakx-backup-do-not-use-ef016519fadd0d52908858470a704cce6a8ceeff.tar.gz
drakx-backup-do-not-use-ef016519fadd0d52908858470a704cce6a8ceeff.tar.bz2
drakx-backup-do-not-use-ef016519fadd0d52908858470a704cce6a8ceeff.tar.xz
drakx-backup-do-not-use-ef016519fadd0d52908858470a704cce6a8ceeff.zip
This commit was manufactured by cvs2svn to create tag 'V1_1_9_55mdk'.V1_1_9_55mdk
Diffstat (limited to 'perl-install/detect_devices.pm')
-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..383844143 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/ACPI stuff
+ foreach (syslog()) {
+ my $nprocs = (m/(^Processors: (\d+)|(\d+) CPUs avail)/)[1] 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