[T2311] name servers via cmdline can't take effect

Please refer to https://phabricator.vyos.net/T2311

1 files changed, 12 insertions, 1 deletions

diff --git a/src/services/vyos-hostsd b/src/services/vyos-hostsd
index a655762e9..647cbc8c1 100755
--- a/src/services/vyos-hostsd
+++ b/src/services/vyos-hostsd
@@ -25,6 +25,7 @@ import traceback
 import re
 import logging
 import zmq
+import collections
 
 import jinja2
 
@@ -79,8 +80,18 @@ resolv_tmpl_source = """
 ### Autogenerated by VyOS ###
 ### Do not edit, your changes will get overwritten ###
 
+# name server from static configuration
 {% for ns in name_servers -%}
+{%- if name_servers[ns]['tag'] == "static" %}
 nameserver {{ns}}
+{%- endif %}
+{% endfor -%}
+
+{% for ns in name_servers -%}
+{%- if name_servers[ns]['tag'] != "static" %}
+# name server from {{name_servers[ns]['tag']}}
+nameserver {{ns}}
+{%- endif %}
 {% endfor -%}
 
 {%- if domain_name %}
@@ -110,7 +121,7 @@ resolv_tmpl = jinja2.Template(resolv_tmpl_source)
 # and re-created without having to track what needs
 # to be changed
 STATE = {
-    "name_servers": {},
+    "name_servers": collections.OrderedDict({}),
     "hosts": {},
     "host_name": "vyos",
     "domain_name": "",