summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-03-03 10:42:24 +0000
committerOlivier Blin <oblin@mandriva.org>2005-03-03 10:42:24 +0000
commitb5692523a12d5be4e6e6f76c045b3bcedd0035a2 (patch)
tree19dbfd47ca0d4f372a764285ced835577674f367
parent046612a0de8eacaecb1914333f9d4facb4ac44cb (diff)
downloaddrakx-b5692523a12d5be4e6e6f76c045b3bcedd0035a2.tar
drakx-b5692523a12d5be4e6e6f76c045b3bcedd0035a2.tar.gz
drakx-b5692523a12d5be4e6e6f76c045b3bcedd0035a2.tar.bz2
drakx-b5692523a12d5be4e6e6f76c045b3bcedd0035a2.tar.xz
drakx-b5692523a12d5be4e6e6f76c045b3bcedd0035a2.zip
delete gateway settings if gateway device is invalid too (#11761)
-rw-r--r--perl-install/network/netconnect.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 9dc723fdf..74f04ccef 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -1071,8 +1071,8 @@ notation (for example, 1.2.3.4).")),
$netc->{$_} = $ethntf->{DEVICE} foreach qw(NET_DEVICE NET_INTERFACE);
if ($auto_ip) {
$in->do_pkgs->install($netc->{dhcp_client});
- #- delete gateway settings if reconfiguring the gateway interface to dhcp
- if ($netc->{GATEWAYDEV} eq $ntf_name || @all_cards > 1) {
+ #- delete gateway settings if gateway device is invalid or if reconfiguring the gateway interface to dhcp
+ if (!$netc->{GATEWAYDEV} || !exists $eth_intf{$netc->{GATEWAYDEV}} || $netc->{GATEWAYDEV} eq $ntf_name) {
delete $netc->{GATEWAY};
delete $netc->{GATEWAYDEV};
}