summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2019-07-03 12:41:33 +0200
committerDaniil Baturin <daniil@baturin.org>2019-07-04 11:49:41 +0200
commit6e16353c0162302985355cb642298e3bbb2b6061 (patch)
tree2a15b2337ee8452727ad6d15a5a52cbdc3749988 /src/conf_mode
parentd76798085ea8a77ffca3c6fbb6df74fc3121c333 (diff)
downloadvyos-1x-6e16353c0162302985355cb642298e3bbb2b6061.tar.gz
vyos-1x-6e16353c0162302985355cb642298e3bbb2b6061.zip
T1497: remove the no longer necessary workaround for bad return_effective_values output.
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/host_name.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py
index c5268df2a..475f68b49 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -117,10 +117,7 @@ def get_config(arguments):
hosts['domain_search'].append(search)
if conf.exists("system name-server"):
- if not isinstance(conf.return_values("system name-server"), list):
- hosts['nameserver'] = conf.return_values("system name-server").replace("'", "").split()
- else:
- hosts['nameserver'] = conf.return_values("system name-server")
+ hosts['nameserver'] = conf.return_values("system name-server")
hosts['no_dhcp_ns'] = conf.exists('system disable-dhcp-nameservers')