diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-03-02 18:41:37 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-03-02 18:41:37 +0000 |
| commit | 442b3185cca011f58168fddc59f5ece18fc20f5e (patch) | |
| tree | 70ea4653480af0993463f850bd2332884fcd6ebc /perl-install/network | |
| parent | fc8efc5f84886a36ece09d728d26bc2a06d0876b (diff) | |
| download | drakx-backup-do-not-use-442b3185cca011f58168fddc59f5ece18fc20f5e.tar drakx-backup-do-not-use-442b3185cca011f58168fddc59f5ece18fc20f5e.tar.gz drakx-backup-do-not-use-442b3185cca011f58168fddc59f5ece18fc20f5e.tar.bz2 drakx-backup-do-not-use-442b3185cca011f58168fddc59f5ece18fc20f5e.tar.xz drakx-backup-do-not-use-442b3185cca011f58168fddc59f5ece18fc20f5e.zip | |
delete gateway settings if reconfiguring the gateway interface to dhcp
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/netconnect.pm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 77253ef51..9dc723fdf 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -1069,7 +1069,14 @@ notation (for example, 1.2.3.4).")), $ethntf->{MII_NOT_SUPPORTED} = bool2yesno(!$hotplug); $ethntf->{HWADDR} = $track_network_id or delete $ethntf->{HWADDR}; $netc->{$_} = $ethntf->{DEVICE} foreach qw(NET_DEVICE NET_INTERFACE); - $in->do_pkgs->install($netc->{dhcp_client}) if $auto_ip; + 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 $netc->{GATEWAY}; + delete $netc->{GATEWAYDEV}; + } + } return $is_wireless ? "wireless" : "static_hostname"; }, }, |