From f8d8b81e0fbfd1a2b55f1e52bd710e93e8cb890b Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Fri, 6 Feb 2004 11:25:04 +0000
Subject: (main) try first to match a pcmcia device before trying to match
 pci/usb when looking for module (#7431)

---
 perl-install/network/netconnect.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'perl-install')

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"),
-- 
cgit v1.2.1