diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-04-05 16:26:28 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-04-05 16:26:28 -0300 |
| commit | c91ad05b3d0ceac2ded0ff14d0e7cff5f6fe256e (patch) | |
| tree | 3fedc244191a37dea83462145b55493f1b18f6b7 /templates/dhcp | |
| parent | 261bb2139bba1d7b8be21776b9c06ba1fa241582 (diff) | |
| download | puppet-nodo-c91ad05b3d0ceac2ded0ff14d0e7cff5f6fe256e.tar.gz puppet-nodo-c91ad05b3d0ceac2ded0ff14d0e7cff5f6fe256e.tar.bz2 | |
Use supersede_domain_name and supersede_domain_search
Diffstat (limited to 'templates/dhcp')
| -rw-r--r-- | templates/dhcp/dhclient.conf.erb | 8 |
1 files changed, 5 insertions, 3 deletions
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, |