diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-03-15 10:50:16 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-03-15 10:50:16 +0000 |
| commit | d38455ae09c536f28ffd9f7ed57587e8df9344f6 (patch) | |
| tree | 01186b562f3ca393ff2f24a868735c80b5920e64 | |
| parent | 9d68d9e760041acc5a56e85c94129a0ec8a4df85 (diff) | |
| download | drakx-d38455ae09c536f28ffd9f7ed57587e8df9344f6.tar drakx-d38455ae09c536f28ffd9f7ed57587e8df9344f6.tar.gz drakx-d38455ae09c536f28ffd9f7ed57587e8df9344f6.tar.bz2 drakx-d38455ae09c536f28ffd9f7ed57587e8df9344f6.tar.xz drakx-d38455ae09c536f28ffd9f7ed57587e8df9344f6.zip | |
allow not to set gateway device (#14633)
| -rw-r--r-- | perl-install/network/netconnect.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 9216891c2..740eace89 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -1262,8 +1262,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 %all_eth_intf ], - format => sub { $all_eth_intf{$_[0]} } }, + { label => N("Gateway device"), val => \$netc->{GATEWAYDEV}, list => [ N("None"), sort keys %all_eth_intf ], + format => sub { $all_eth_intf{$_[0]} || $_[0] } }, ), ), ]; @@ -1280,8 +1280,10 @@ N("Last but not least you can also type in your DNS server IP addresses."), return 1; } }, - #post => $handle_multiple_cnx, - next => "zeroconf", + post => sub { + $netc->{GATEWAYDEV} eq N("None") and delete $netc->{GATEWAYDEV}; + return "zeroconf"; + } }, |