From d38455ae09c536f28ffd9f7ed57587e8df9344f6 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Tue, 15 Mar 2005 10:50:16 +0000
Subject: allow not to set gateway device (#14633)

---
 perl-install/network/netconnect.pm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'perl-install/network')

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";
+                    }
                    },
 
 
-- 
cgit v1.2.1