diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-11-17 21:13:19 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-11-17 21:13:19 +0100 |
| commit | d3b689ecb951c49dddf0402f36f51a2e0d8216b3 (patch) | |
| tree | 1048aec8ff2347696643d92a4bf48170936b4201 /src/conf_mode/host_name.py | |
| parent | 80375d2be96c53f2fa4a827f93105dc32931401f (diff) | |
| parent | 4e4f1dbd745952a24d70c3e2d7dc495d675dff34 (diff) | |
| download | vyos-1x-d3b689ecb951c49dddf0402f36f51a2e0d8216b3.tar.gz vyos-1x-d3b689ecb951c49dddf0402f36f51a2e0d8216b3.zip | |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
dns: T1786: add proper processing of 'system disable-dhcp-nameservers'
openvpn: fix typo in op-mode command on display rx bytes
T1801: escape isolated backslashes before passing to ConfigTree()
wireless: T1627: fix interface names for list_interfaces.py
[service https] T1443: add setting of HTTPS listen port
Diffstat (limited to 'src/conf_mode/host_name.py')
| -rwxr-xr-x | src/conf_mode/host_name.py | 6 |
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) |