summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-25 18:29:43 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-25 18:29:43 +0000
commit82f8c77cddc5f2de64996ebbb64d4a3dd7a33d1f (patch)
tree5d195f679acecaa2e738fa528abb900df5532387 /perl-install
parenta48342a0a918bc292ac7f1c6a77353e2dd762e63 (diff)
downloaddrakx-82f8c77cddc5f2de64996ebbb64d4a3dd7a33d1f.tar
drakx-82f8c77cddc5f2de64996ebbb64d4a3dd7a33d1f.tar.gz
drakx-82f8c77cddc5f2de64996ebbb64d4a3dd7a33d1f.tar.bz2
drakx-82f8c77cddc5f2de64996ebbb64d4a3dd7a33d1f.tar.xz
drakx-82f8c77cddc5f2de64996ebbb64d4a3dd7a33d1f.zip
(dmi_probe) simplify after r690
(was: "try to parse DMI informations only on x86 to avoid reading/writing some random memory location on arm/mips")
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/detect_devices.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 2d3c2fd5c..ad875b352 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -967,13 +967,11 @@ sub pcmcia_probe() {
my $dmi_probe;
sub dmi_probe() {
if (arch() !~ /86/) {
- $dmi_probe ||= [];
+ return [];
}
- else {
$dmi_probe ||= [ map {
/(.*?)\t(.*)/ && { bus => 'DMI', driver => $1, description => $2 };
} $> ? () : c::dmi_probe() ];
- }
@$dmi_probe;
}