diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | lib/network/connection/ethernet.pm | 7 |
2 files changed, 6 insertions, 2 deletions
@@ -10,6 +10,7 @@ - avoid multiple instances of draknetcenter for the same user (if it's already running) - Change prism54 wifi driver to p54pci/p54usb (#52018) +- Don't guess gateway and nameserver if not specified (#28033) 0.86.1: - ignore non-fatal wpa_supplicant messages (#54002) diff --git a/lib/network/connection/ethernet.pm b/lib/network/connection/ethernet.pm index 61e5ca6..4be7a88 100644 --- a/lib/network/connection/ethernet.pm +++ b/lib/network/connection/ethernet.pm @@ -121,8 +121,11 @@ sub supplement_address_settings { if ($self->{protocol} eq 'static' && network::network::is_ip($self->{address}{ip_address})) { require network::network; $self->{address}{netmask} ||= network::network::netmask($self->{address}{ip_address}); - $self->{address}{gateway} ||= network::network::gateway($self->{address}{ip_address}); - $self->{address}{dns1} ||= network::network::dns($self->{address}{ip_address}); + # Bug #28033: don't guess default gateway and ns in static interfaces if + # user doesn't set one (otherwise we'll mess multi-interface systems) + # + #$self->{address}{gateway} ||= network::network::gateway($self->{address}{ip_address}); + #$self->{address}{dns1} ||= network::network::dns($self->{address}{ip_address}); } } |