diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-10-20 15:17:08 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-10-20 15:17:08 +0000 |
commit | 4c0e8bc9d01fead5c1579cecc1809ded8222ae67 (patch) | |
tree | bd435c3b04e3e17b2925cc85a3a0bc9b6ffcbef9 /perl-install/detect_devices.pm | |
parent | 2f1b333ae0e5813932a3decae30380ce924f4d33 (diff) | |
download | drakx-4c0e8bc9d01fead5c1579cecc1809ded8222ae67.tar drakx-4c0e8bc9d01fead5c1579cecc1809ded8222ae67.tar.gz drakx-4c0e8bc9d01fead5c1579cecc1809ded8222ae67.tar.bz2 drakx-4c0e8bc9d01fead5c1579cecc1809ded8222ae67.tar.xz drakx-4c0e8bc9d01fead5c1579cecc1809ded8222ae67.zip |
- fix detecting SMP (was broken we relied on install kernel being non-smp) (#44825)
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r-- | perl-install/detect_devices.pm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 1a8e64ca3..f8e553430 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -987,6 +987,7 @@ sub get_mac_generation() { sub hasSMP() { return if $::testing; (any { /NR_CPUS limit of 1 reached/ } syslog()) || + (any { /^processor\s*:\s*(\d+)/ && $1 > 0 } 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) |