diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-14 08:29:02 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-14 08:29:02 +0000 |
| commit | 0ef292ec5453e0b367975ae22f046457c390f23c (patch) | |
| tree | e452607b8c211c04eb382e38801691641170a91d /perl-install/harddrake | |
| parent | fb23cb243c0a52cbf9e7372666dd0aeac35dd296 (diff) | |
| download | drakx-0ef292ec5453e0b367975ae22f046457c390f23c.tar drakx-0ef292ec5453e0b367975ae22f046457c390f23c.tar.gz drakx-0ef292ec5453e0b367975ae22f046457c390f23c.tar.bz2 drakx-0ef292ec5453e0b367975ae22f046457c390f23c.tar.xz drakx-0ef292ec5453e0b367975ae22f046457c390f23c.zip | |
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.
Diffstat (limited to 'perl-install/harddrake')
| -rw-r--r-- | perl-install/harddrake/data.pm | 9 |
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, }, |