diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-09 22:53:42 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-09 22:53:42 +0000 |
| commit | 622599ba23d2faa8253afbd14bf2aca5cfa2e7c4 (patch) | |
| tree | 6b6c25d674a9e825692ca1745f3f8400341ac0ed /perl-install/network/netconnect.pm | |
| parent | 9afaffbcbb8ffde571f88ec05b505ed6c4ce42c5 (diff) | |
| download | drakx-622599ba23d2faa8253afbd14bf2aca5cfa2e7c4.tar drakx-622599ba23d2faa8253afbd14bf2aca5cfa2e7c4.tar.gz drakx-622599ba23d2faa8253afbd14bf2aca5cfa2e7c4.tar.bz2 drakx-622599ba23d2faa8253afbd14bf2aca5cfa2e7c4.tar.xz drakx-622599ba23d2faa8253afbd14bf2aca5cfa2e7c4.zip | |
fix unability to select gateway (#7585)
Diffstat (limited to 'perl-install/network/netconnect.pm')
| -rw-r--r-- | perl-install/network/netconnect.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 67c919188..bb6a7d8e6 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -79,7 +79,7 @@ sub get_subwizard { my $mouse = $o_mouse ||= {}; my $intf = $o_intf ||= {}; my $first_time = $o_first_time || 0; - my ($network_configured, $direct_net_install, $cnx_type, $type, $interface, @all_cards, @devices, %eth_intf); + my ($network_configured, $direct_net_install, $cnx_type, $type, $interface, @all_cards, %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_protocol, @adsl_devices, $adsl_failed, $adsl_answer, %adsl_data, $adsl_data, $adsl_provider, $adsl_old_provider); @@ -980,8 +980,9 @@ You may also enter the IP address of the gateway if you have one."), { label => N("Search domain"), val => \$netc->{DOMAINNAME}, help => N("By default search domain will be set from the fully-qualified host name") }, if_(!$auto_ip, { label => N("Gateway (e.g. %s)", $gateway_ex), val => \$netc->{GATEWAY} }, - if_(@devices > 1, - { label => N("Gateway device"), val => \$netc->{GATEWAYDEV}, list => \@devices }, + if_(@all_cards > 1, + { label => N("Gateway device"), val => \$netc->{GATEWAYDEV}, list => [ sort keys %eth_intf ], + format => sub { $eth_intf{$_[0]} } }, ), ), ], |