diff options
author | Thierry Vignaud <tv@mageia.org> | 2012-01-25 18:29:43 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2012-01-25 18:29:43 +0000 |
commit | e395c18057f9f7ee85ef8921c66814c08d8b196f (patch) | |
tree | 5d195f679acecaa2e738fa528abb900df5532387 /perl-install | |
parent | e4460915fedc9663e5f5c5ef2129dd45a4ab093e (diff) | |
download | drakx-backup-do-not-use-e395c18057f9f7ee85ef8921c66814c08d8b196f.tar drakx-backup-do-not-use-e395c18057f9f7ee85ef8921c66814c08d8b196f.tar.gz drakx-backup-do-not-use-e395c18057f9f7ee85ef8921c66814c08d8b196f.tar.bz2 drakx-backup-do-not-use-e395c18057f9f7ee85ef8921c66814c08d8b196f.tar.xz drakx-backup-do-not-use-e395c18057f9f7ee85ef8921c66814c08d8b196f.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.pm | 4 |
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; } |