summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2019-07-03 12:41:33 +0200
committerDaniil Baturin <daniil@baturin.org>2019-07-03 12:41:33 +0200
commitacd5f855bcca98008719d0ef371be3076861b4f1 (patch)
tree2bbb8a290627a0b42a73efc1a2934fec40d4530c
parent3f7322d7f15ac348f1d06ba411c935956e276a76 (diff)
downloadvyos-1x-acd5f855bcca98008719d0ef371be3076861b4f1.tar.gz
vyos-1x-acd5f855bcca98008719d0ef371be3076861b4f1.zip
T1497: remove the no longer necessary workaround for bad return_effective_values output.
-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 43f36dd35..b0a4648c7 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -124,10 +124,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")
if conf.exists("system disable-dhcp-nameservers"):
hosts['no_dhcp_ns'] = conf.exists('system disable-dhcp-nameservers')