summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-06 11:25:04 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-06 11:25:04 +0000
commitf8d8b81e0fbfd1a2b55f1e52bd710e93e8cb890b (patch)
tree78026941ea57c1ff444c498f887177ebf17ab7bb
parent71c19a2b3efe143500258fa969d0b6d6c9d639a1 (diff)
downloaddrakx-f8d8b81e0fbfd1a2b55f1e52bd710e93e8cb890b.tar
drakx-f8d8b81e0fbfd1a2b55f1e52bd710e93e8cb890b.tar.gz
drakx-f8d8b81e0fbfd1a2b55f1e52bd710e93e8cb890b.tar.bz2
drakx-f8d8b81e0fbfd1a2b55f1e52bd710e93e8cb890b.tar.xz
drakx-f8d8b81e0fbfd1a2b55f1e52bd710e93e8cb890b.zip
(main) try first to match a pcmcia device before trying to match
pci/usb when looking for module (#7431)
-rw-r--r--perl-install/network/netconnect.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 006c46485..dc1664a8a 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -144,7 +144,13 @@ sub get_subwizard {
}
};
- my $find_lan_module = sub { $module ||= (find { $_->[0] eq $ethntf->{DEVICE} } @all_cards)->[1] };
+ my $find_lan_module = sub {
+ if (my $dev = find { $_->{device} eq $ethntf->{DEVICE} } detect_devices::pcmcia_probe()) { # PCMCIA case
+ $module = $b->{driver};
+ } elsif (my $dev = find { $_->[0] eq $ethntf->{DEVICE} } @all_cards) {
+ $module = $dev->[1];
+ } else { $module = "" }
+ };
my %adsl_devices = (
speedtouch => N("Alcatel speedtouch USB modem"),