summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-09-22 14:56:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-09-22 14:56:14 +0000
commita7ba1a2526952c68ad61923133c76f268c1011b7 (patch)
treeff25b0173b9e1a61a3c7da152621291768745a67
parent1cfcd55df7d19bc82794a4ce3c5686748cbc0440 (diff)
downloaddrakx-a7ba1a2526952c68ad61923133c76f268c1011b7.tar
drakx-a7ba1a2526952c68ad61923133c76f268c1011b7.tar.gz
drakx-a7ba1a2526952c68ad61923133c76f268c1011b7.tar.bz2
drakx-a7ba1a2526952c68ad61923133c76f268c1011b7.tar.xz
drakx-a7ba1a2526952c68ad61923133c76f268c1011b7.zip
dmi doesn't detect ht, but acpi does, so use it
-rw-r--r--perl-install/detect_devices.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index a8c2d2d39..d718c0071 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -584,7 +584,10 @@ sub get_mac_generation() {
return "Unknown Generation";
}
-sub hasSMP() { !$::testing && c::detectSMP() }
+sub hasSMP() {
+ return if $::testing;
+ c::detectSMP() || any { /\bProcessors: (\d+)/ && $1 > 1 } syslog();
+}
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