diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-06-12 14:10:44 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-06-12 14:10:44 +0000 |
| commit | 014a65964c200155ec01d633c8653c3840cec9c2 (patch) | |
| tree | 2a0f56e94e232bb3be8563f3a80fe45bbeaf4c53 /perl-install/detect_devices.pm | |
| parent | 726052354a8a77b85e11c620e3c9fbe98522ff57 (diff) | |
| download | drakx-backup-do-not-use-014a65964c200155ec01d633c8653c3840cec9c2.tar drakx-backup-do-not-use-014a65964c200155ec01d633c8653c3840cec9c2.tar.gz drakx-backup-do-not-use-014a65964c200155ec01d633c8653c3840cec9c2.tar.bz2 drakx-backup-do-not-use-014a65964c200155ec01d633c8653c3840cec9c2.tar.xz drakx-backup-do-not-use-014a65964c200155ec01d633c8653c3840cec9c2.zip | |
merge with x86_64-branch
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 10 |
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 |