diff options
| author | hagbard <vyosdev@derith.de> | 2019-07-02 13:10:40 -0700 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2019-07-02 13:10:40 -0700 |
| commit | feaf914cbb70c3a810ccde6f00d157e536d350d8 (patch) | |
| tree | eea2053eb5ceba3da3b51e9573418a75bf57dc62 /src/conf_mode | |
| parent | c35d1b7a1d958327f67c806740428929ff86b151 (diff) | |
| parent | 768e73ccba8aa9e512abb3f836743a7c6af53f5d (diff) | |
| download | vyos-1x-feaf914cbb70c3a810ccde6f00d157e536d350d8.tar.gz vyos-1x-feaf914cbb70c3a810ccde6f00d157e536d350d8.zip | |
Merge branch 'current' of https://github.com/vyos/vyos-1x into current
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/host_name.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py index b0a4648c7..43f36dd35 100755 --- a/src/conf_mode/host_name.py +++ b/src/conf_mode/host_name.py @@ -124,7 +124,10 @@ def get_config(arguments): hosts['domain_search'].append(search) if conf.exists("system name-server"): - hosts['nameserver'] = conf.return_values("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") if conf.exists("system disable-dhcp-nameservers"): hosts['no_dhcp_ns'] = conf.exists('system disable-dhcp-nameservers') |