From c91ad05b3d0ceac2ded0ff14d0e7cff5f6fe256e Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 5 Apr 2016 16:26:28 -0300 Subject: Use supersede_domain_name and supersede_domain_search --- templates/dhcp/dhclient.conf.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/dhcp/dhclient.conf.erb b/templates/dhcp/dhclient.conf.erb index 1e27e2d..8590bb8 100644 --- a/templates/dhcp/dhclient.conf.erb +++ b/templates/dhcp/dhclient.conf.erb @@ -18,10 +18,12 @@ option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; #send dhcp-lease-time 3600; #prepend domain-name-servers 127.0.0.1; -<%- if @supersede_domain != '' then -%> +<%- if @supersede_domain_name != '' then -%> # Force a domain name, otherwise facter and other configurations might break. -supersede domain-name "<%= @supersede_domain %>"; -supersede domain-search "<%= @supersede_domain %>"; +supersede domain-name "<%= @supersede_domain_name %>"; +<%- end -%> +<%- if @supersede_domain_search != '' then -%> +supersede domain-search "<%= @supersede_domain_search %>"; <%- end -%> request subnet-mask, broadcast-address, time-offset, routers, -- cgit v1.2.3