diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-05-28 08:21:15 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-05-28 08:21:15 +0000 |
| commit | 7db099c14da7fde27be0cd6dbe0bf79183420a4f (patch) | |
| tree | 646b1d606c8f0c60d18d54b43861e099a93c21cd /perl-install/network/ethernet.pm | |
| parent | bb5d5f6f9a104490f1d4497a091d3ed9adac0ca2 (diff) | |
| download | drakx-backup-do-not-use-7db099c14da7fde27be0cd6dbe0bf79183420a4f.tar drakx-backup-do-not-use-7db099c14da7fde27be0cd6dbe0bf79183420a4f.tar.gz drakx-backup-do-not-use-7db099c14da7fde27be0cd6dbe0bf79183420a4f.tar.bz2 drakx-backup-do-not-use-7db099c14da7fde27be0cd6dbe0bf79183420a4f.tar.xz drakx-backup-do-not-use-7db099c14da7fde27be0cd6dbe0bf79183420a4f.zip | |
merge fixes from HEAD
Diffstat (limited to 'perl-install/network/ethernet.pm')
| -rw-r--r-- | perl-install/network/ethernet.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index 845d7b3d8..193bbf539 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -39,7 +39,8 @@ sub mapIntfToDevice { my ($interface) = @_; my $hw_addr = c::getHwIDs($interface); my ($bus, $slot, $func) = map { hex($_) } ($hw_addr =~ /([0-9a-f]+):([0-9a-f]+)\.([0-9a-f]+)/); - $hw_addr ? grep { $_->{pci_bus} == $bus && $_->{pci_device} == $slot && $_->{pci_function} == $func } detect_devices::probeall() : {}; + $hw_addr && (every { defined $_ } $bus, $slot, $func) ? + grep { $_->{pci_bus} == $bus && $_->{pci_device} == $slot && $_->{pci_function} == $func } detect_devices::probeall() : {}; } @@ -63,7 +64,7 @@ sub get_eth_cards() { } if (!$description) { my @cards = grep { $_->{driver} eq ($a || $saved_driver) } detect_devices::probeall(); - $description = $cards[0]{descripxtion} if @cards == 1; + $description = $cards[0]->{description} if $#cards == 0; } $a and $saved_driver = $a; # handle multiple cards managed by the same driver [ $interface, $saved_driver, if_($description, $description) ] |