diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-08-22 16:36:32 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-08-22 16:36:32 -0400 |
| commit | ba20ec431aa9275423d2e09154f5befb8961373b (patch) | |
| tree | a5b7cad4967b208815ac8b0cabfa589e0a0354d4 /templates | |
| parent | f181c7cbdc08222f195fa84a379f35a456d26123 (diff) | |
| parent | d723c17b7abe5263d879d748dade763034cce476 (diff) | |
| download | vyos-cloud-init-ba20ec431aa9275423d2e09154f5befb8961373b.tar.gz vyos-cloud-init-ba20ec431aa9275423d2e09154f5befb8961373b.zip | |
merge from trunk
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/resolv.conf.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/resolv.conf.tmpl b/templates/resolv.conf.tmpl index 6f908f30..1300156c 100644 --- a/templates/resolv.conf.tmpl +++ b/templates/resolv.conf.tmpl @@ -21,7 +21,7 @@ domain {{domain}} sortlist {% for sort in sortlist %}{{sort}} {% endfor %} {% endif %} -{% if options is defined or flags is defined %} +{% if options or flags %} options {% for flag in flags %}{{flag}} {% endfor %} {% for key, value in options.iteritems() -%} |