From e2dde9fe012367314c778c610f20640ed0811f0c Mon Sep 17 00:00:00 2001 From: Maciej Delmanowski Date: Sun, 29 Mar 2015 23:36:16 +0200 Subject: [PATCH] Set domain-search options by default --- templates/etc/dhcp/auto_options.j2 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/etc/dhcp/auto_options.j2 b/templates/etc/dhcp/auto_options.j2 index 63ef653..72eb0cf 100644 --- a/templates/etc/dhcp/auto_options.j2 +++ b/templates/etc/dhcp/auto_options.j2 @@ -1,10 +1,9 @@ {% if dhcpd_domain_name|d() and dhcpd_domain_name %} +{% set dhcpd_tpl_domain_search = [ dhcpd_domain_name ] + dhcpd_domain_search|d([]) %} option domain-name "{{ dhcpd_domain_name }}"; -{% endif %} -{% if dhcpd_domain_search|d() and dhcpd_domain_search %} -option domain-search "{{ dhcpd_domain_search | join('", "') }}"; -option dhcp6.domain-search "{{ dhcpd_domain_search | join('", "') }}"; +option domain-search "{{ dhcpd_tpl_domain_search | join('", "') }}"; +option dhcp6.domain-search "{{ dhcpd_tpl_domain_search | join('", "') }}"; {% endif %} {% if dhcpd_nameservers|d() and dhcpd_nameservers %}