diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-10-04 09:07:36 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-10-04 09:07:36 +0000 |
| commit | d70e578501e6cddb4cacba884a27c30b410b1a7d (patch) | |
| tree | fe7a32b6efc7550ea1ec870b9e2bcae630ce9644 | |
| parent | 34dc4a34d52a888d4f4879f8bc9ca9db0c8e6b96 (diff) | |
| download | drakx-d70e578501e6cddb4cacba884a27c30b410b1a7d.tar drakx-d70e578501e6cddb4cacba884a27c30b410b1a7d.tar.gz drakx-d70e578501e6cddb4cacba884a27c30b410b1a7d.tar.bz2 drakx-d70e578501e6cddb4cacba884a27c30b410b1a7d.tar.xz drakx-d70e578501e6cddb4cacba884a27c30b410b1a7d.zip | |
do not lose GATEWAYDEV if it is a non wireless one and a static
wireless card is configured (and vice versa)
| -rw-r--r-- | perl-install/network/netconnect.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index a1a09920c..a34196d1f 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -80,7 +80,7 @@ sub real_main { my $mouse = $o_mouse ||= {}; my $intf = $o_intf ||= {}; my $first_time = $o_first_time || 0; - my ($network_configured, $cnx_type, $type, @all_cards, %eth_intf); + my ($network_configured, $cnx_type, $type, @all_cards, %eth_intf, %all_eth_intf); my (%connections, @connection_list, $is_wireless); my ($modem, $modem_name, $modem_conf_read, $modem_dyn_dns, $modem_dyn_ip); my ($adsl_type, @adsl_devices, $adsl_failed, $adsl_answer, %adsl_data, $adsl_data, $adsl_provider, $adsl_old_provider); @@ -128,8 +128,8 @@ sub real_main { require network::ethernet; modules::interactive::load_category($in, $modules_conf, network::ethernet::get_eth_categories(), !$::expert, 0); @all_cards = network::ethernet::get_eth_cards($modules_conf); - %eth_intf = network::ethernet::get_eth_cards_names(@all_cards); - require list_modules; + %all_eth_intf = network::ethernet::get_eth_cards_names(@all_cards); #- needed not to loose GATEWAYDEV + require list_modules; #- FIXME: check if useful %eth_intf = map { $_->[0] => join(': ', $_->[0], $_->[2]) } grep { to_bool($is_wireless) == c::isNetDeviceWirelessAware($_->[0]) } @all_cards; }; @@ -1175,8 +1175,8 @@ N("Last but not least you can also type in your DNS server IP addresses."), help => N("By default search domain will be set from the fully-qualified host name") }, { label => N("Gateway (e.g. %s)", $gateway_ex), val => \$netc->{GATEWAY} }, if_(@all_cards > 1, - { label => N("Gateway device"), val => \$netc->{GATEWAYDEV}, list => [ sort keys %eth_intf ], - format => sub { $eth_intf{$_[0]} } }, + { label => N("Gateway device"), val => \$netc->{GATEWAYDEV}, list => [ sort keys %all_eth_intf ], + format => sub { $all_eth_intf{$_[0]} } }, ), ), ], |