ethernet card detection: only rely on driver for matching ethernet cards, thus

preventing mislisting of other/unwanted devices (eg: bluetooth, wlan, AX25).

last but not least, it enables us to catch ldetect/ldetect-lst/detect_devices
bugs where some devices are *not* seen by drakx and drakconnect.

1 files changed, 2 insertions, 7 deletions

diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 6fc00709e..a9982d34f 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -197,13 +197,8 @@ our @tree =
           #- protocol report are not accurate) so I'll need to verify against
           #- known drivers :-(
           require list_modules;
-          my @usbnet = (list_modules::category2modules('network/usb'), qw(forcedeth nvnet)); # rought hack for nforce2's nvet
-          
-          f(grep {
-              $_->{media_type} && $_->{media_type} =~ /^NETWORK/
-                || member($_->{driver}, @usbnet)
-                  || $_->{type} && $_->{type} eq 'network'
-              } @devices)
+          my @usbnet = list_modules::category2modules('network/gigabit|main|pcmcia|usb|wireless');
+          f(grep { member($_->{driver}, @usbnet) } @devices);
       },
       checked_on_boot => 1,
      },