summaryrefslogtreecommitdiffstats
path: root/perl-install/network/ethernet.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-10-27 10:30:19 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-10-27 10:30:19 +0000
commitbb004c30da7e45f8e27ea09cd597580e56a551e4 (patch)
tree39082660bc15c45a3e1027d309e060b01fcc070c /perl-install/network/ethernet.pm
parent2890ee9dcb7cc758bdd7f08e9542b680f37e52f0 (diff)
downloaddrakx-bb004c30da7e45f8e27ea09cd597580e56a551e4.tar
drakx-bb004c30da7e45f8e27ea09cd597580e56a551e4.tar.gz
drakx-bb004c30da7e45f8e27ea09cd597580e56a551e4.tar.bz2
drakx-bb004c30da7e45f8e27ea09cd597580e56a551e4.tar.xz
drakx-bb004c30da7e45f8e27ea09cd597580e56a551e4.zip
(mapIntfToDevice) do not try to match usb devices since ldetect doesn't return
enough data (thus fixing 9box string)
Diffstat (limited to 'perl-install/network/ethernet.pm')
-rw-r--r--perl-install/network/ethernet.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 84a7db7c5..0a7a3d19f 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -30,6 +30,7 @@ sub write_ether_conf {
sub mapIntfToDevice {
my ($interface) = @_;
my $hw_addr = c::getHwIDs($interface);
+ return {} if $hw_addr =~ /^usb/;
my ($bus, $slot, $func) = map { hex($_) } ($hw_addr =~ /([0-9a-f]+):([0-9a-f]+)\.([0-9a-f]+)/);
$hw_addr && (every { defined $_ } $bus, $slot, $func) ?
grep { $_->{pci_bus} == $bus && $_->{pci_device} == $slot && $_->{pci_function} == $func } detect_devices::probeall() : {};