From 64ee0609c36149afce3f40e9bdead1c54e984958 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Wed, 10 Nov 2004 14:01:24 +0000
Subject: (mapIntfToDevice) backport 9box detection fix: do not try to match
 usb devices since ldetect doesn't return enough data

---
 perl-install/network/ethernet.pm | 1 +
 1 file changed, 1 insertion(+)

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() : {};
-- 
cgit v1.2.1