summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorzdc <zdc@users.noreply.github.com>2019-11-17 19:10:30 +0200
committerChristian Poessinger <christian@poessinger.com>2019-11-17 18:10:30 +0100
commit4e4f1dbd745952a24d70c3e2d7dc495d675dff34 (patch)
treea259b86cf1b8ded71f126ec58c3c55bfe87f0a5f /src/conf_mode
parent1f7b0412316d0d3a308fca77c3a2bd0119287319 (diff)
downloadvyos-1x-4e4f1dbd745952a24d70c3e2d7dc495d675dff34.tar.gz
vyos-1x-4e4f1dbd745952a24d70c3e2d7dc495d675dff34.zip
dns: T1786: add proper processing of 'system disable-dhcp-nameservers'
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/host_name.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py
index bb1ec9597..47cf232e9 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -66,7 +66,7 @@ def get_config():
hosts['nameserver'] = conf.return_values("system name-server")
if conf.exists("system disable-dhcp-nameservers"):
- hosts['no_dhcp_ns'] = conf.exists('system disable-dhcp-nameservers')
+ hosts['no_dhcp_ns'] = True
# system static-host-mapping
hosts['static_host_mapping'] = []
@@ -135,6 +135,10 @@ def apply(config):
try:
client = vyos.hostsd_client.Client()
+ # Check if disable-dhcp-nameservers is configured, and if yes - delete DNS servers added by DHCP
+ if config['no_dhcp_ns']:
+ client.delete_name_servers('dhcp-.+')
+
client.set_host_name(config['hostname'], config['domain_name'], config['domain_search'])
client.delete_name_servers(tag)