diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-03-15 13:18:08 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-03-15 13:18:08 +0000 |
| commit | 8d30193f135798d13fa02c608247d3d2d1b8071b (patch) | |
| tree | a563d3f9530c5e484f24b1e7e608d9cfa1407046 /perl-install/network | |
| parent | 38a66deac2c8c7015221b69fc2c350c4d739b7b9 (diff) | |
| download | drakx-8d30193f135798d13fa02c608247d3d2d1b8071b.tar drakx-8d30193f135798d13fa02c608247d3d2d1b8071b.tar.gz drakx-8d30193f135798d13fa02c608247d3d2d1b8071b.tar.bz2 drakx-8d30193f135798d13fa02c608247d3d2d1b8071b.tar.xz drakx-8d30193f135798d13fa02c608247d3d2d1b8071b.zip | |
do not list anymore wireless cards in LAN connection, only in wireless
connections
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/netconnect.pm | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 0d9e78340..aa4707abb 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -141,13 +141,9 @@ sub real_main { modules::interactive::load_category($in, 'network/main|gigabit|pcmcia|usb|wireless', !$::expert, 0); @all_cards = network::ethernet::get_eth_cards(); %eth_intf = network::ethernet::get_eth_cards_names(@all_cards); - if ($is_wireless) { - require list_modules; - my @wmodules = list_modules::category2modules('network/wireless'); - %eth_intf = map { $_->[0] => join(': ', $_->[0], $_->[2]) } grep { member($_->[1], @wmodules) } @all_cards; - } else { - %eth_intf = map { $_->[0] => join(': ', $_->[0], $_->[2]) } @all_cards; - } + require list_modules; + my @wmodules = list_modules::category2modules('network/wireless'); + %eth_intf = map { $_->[0] => join(': ', $_->[0], $_->[2]) } grep { !$is_wireless ^ member($_->[1], @wmodules) } @all_cards; }; my $find_lan_module = sub { |