summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-20 15:17:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-20 15:17:08 +0000
commit4c0e8bc9d01fead5c1579cecc1809ded8222ae67 (patch)
treebd435c3b04e3e17b2925cc85a3a0bc9b6ffcbef9
parent2f1b333ae0e5813932a3decae30380ce924f4d33 (diff)
downloaddrakx-backup-do-not-use-4c0e8bc9d01fead5c1579cecc1809ded8222ae67.tar
drakx-backup-do-not-use-4c0e8bc9d01fead5c1579cecc1809ded8222ae67.tar.gz
drakx-backup-do-not-use-4c0e8bc9d01fead5c1579cecc1809ded8222ae67.tar.bz2
drakx-backup-do-not-use-4c0e8bc9d01fead5c1579cecc1809ded8222ae67.tar.xz
drakx-backup-do-not-use-4c0e8bc9d01fead5c1579cecc1809ded8222ae67.zip
- fix detecting SMP (was broken we relied on install kernel being non-smp) (#44825)
-rw-r--r--perl-install/detect_devices.pm1
-rw-r--r--perl-install/install/NEWS2
2 files changed, 3 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)
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 0b852c982..9b0e4555b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix detecting SMP (was broken we relied on install kernel being non-smp) (#44825)
+
Version 11.69 - 11 October 2008
- really fix setting lilo when needed (#39878)