summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-11-10 14:01:24 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-11-10 14:01:24 +0000
commit64ee0609c36149afce3f40e9bdead1c54e984958 (patch)
treedafedf332197596096a9e9ed856ddef495fb36c1
parentbd539bad760ec04499af037d50d9500976cf92a0 (diff)
downloaddrakx-backup-do-not-use-64ee0609c36149afce3f40e9bdead1c54e984958.tar
drakx-backup-do-not-use-64ee0609c36149afce3f40e9bdead1c54e984958.tar.gz
drakx-backup-do-not-use-64ee0609c36149afce3f40e9bdead1c54e984958.tar.bz2
drakx-backup-do-not-use-64ee0609c36149afce3f40e9bdead1c54e984958.tar.xz
drakx-backup-do-not-use-64ee0609c36149afce3f40e9bdead1c54e984958.zip
(mapIntfToDevice) backport 9box detection fix:
do not try to match usb devices since ldetect doesn't return enough data
-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() : {};