diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-05-19 15:24:55 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-05-19 15:24:55 +0000 |
| commit | 0c6d74ba0f83b735c2c5f69a21e6de3772ca5282 (patch) | |
| tree | 7b08c0571e2eeac3d4910c71edbb3cb29d7c4a1a | |
| parent | ed8a707a71d8f91866eae75587de65d5289490ce (diff) | |
| download | drakx-0c6d74ba0f83b735c2c5f69a21e6de3772ca5282.tar drakx-0c6d74ba0f83b735c2c5f69a21e6de3772ca5282.tar.gz drakx-0c6d74ba0f83b735c2c5f69a21e6de3772ca5282.tar.bz2 drakx-0c6d74ba0f83b735c2c5f69a21e6de3772ca5282.tar.xz drakx-0c6d74ba0f83b735c2c5f69a21e6de3772ca5282.zip | |
filter LAN and Wireless cards by explicitely checking whether network
interfaces support wireless extensions or not instead of relying on
both ethtool support (in order to get the module name) and checking
against a whitelist of known wireless awere cards
| -rw-r--r-- | perl-install/network/netconnect.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 2e1dd5908..eeba931d0 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -130,8 +130,8 @@ sub real_main { @all_cards = network::ethernet::get_eth_cards(); %eth_intf = network::ethernet::get_eth_cards_names(@all_cards); require list_modules; - my @wmodules = list_modules::category2modules('network/wireless'); - %eth_intf = map { $_->[0] => join(': ', $_->[0], $_->[2]) } grep { int(!$is_wireless) ^ member($_->[1], @wmodules) } @all_cards; + %eth_intf = map { $_->[0] => join(': ', $_->[0], $_->[2]) } + grep { $is_wireless ^ !c::isNetDeviceWirelessAware($_->[0]) } @all_cards; }; my $find_lan_module = sub { |