summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-04-15 13:59:44 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-04-15 13:59:44 +0000
commitb1b5a86a6ca0f02e9daa41bd977067d330f60c97 (patch)
treeabd4a0d17b9a73e50e0427668cf40cc49f9060bd
parent9cfc249546dbdabbe50baa88eee19cfe6425ceff (diff)
downloaddrakx-backup-do-not-use-b1b5a86a6ca0f02e9daa41bd977067d330f60c97.tar
drakx-backup-do-not-use-b1b5a86a6ca0f02e9daa41bd977067d330f60c97.tar.gz
drakx-backup-do-not-use-b1b5a86a6ca0f02e9daa41bd977067d330f60c97.tar.bz2
drakx-backup-do-not-use-b1b5a86a6ca0f02e9daa41bd977067d330f60c97.tar.xz
drakx-backup-do-not-use-b1b5a86a6ca0f02e9daa41bd977067d330f60c97.zip
Fix hasSMP()
-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 39c86f38e..383844143 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -481,7 +481,7 @@ sub get_mac_generation() {
sub hasSMP {
# Much simpler if we have APIC/ACPI stuff
foreach (syslog()) {
- my ($nprocs) = (m/Processors: (\d+)/ || m/(\d+) CPUs avail/) or next;
+ my $nprocs = (m/(^Processors: (\d+)|(\d+) CPUs avail)/)[1] or next;
return $nprocs > 1 ? 1 : 0;
}
c::detectSMP()