summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-02-28 21:59:20 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-02-28 21:59:20 +0000
commit7a119bfc851f6206fba2b30250f927e72ce2f5e6 (patch)
treee94dd428931fdb10039eaaa1056c21dde636c604
parent27c514fa6bf2c2f4f8f85dd855cd30666d0f9355 (diff)
downloaddrakx-7a119bfc851f6206fba2b30250f927e72ce2f5e6.tar
drakx-7a119bfc851f6206fba2b30250f927e72ce2f5e6.tar.gz
drakx-7a119bfc851f6206fba2b30250f927e72ce2f5e6.tar.bz2
drakx-7a119bfc851f6206fba2b30250f927e72ce2f5e6.tar.xz
drakx-7a119bfc851f6206fba2b30250f927e72ce2f5e6.zip
let hasSMP don't exit DrakX in testing mode because /dev/mem is not accessible
-rw-r--r--perl-install/detect_devices.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index e77b36090..91afd12e6 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -553,7 +553,7 @@ sub get_mac_generation() {
return "Unknown Generation";
}
-sub hasSMP { c::detectSMP() }
+sub hasSMP { !$::testing && 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