From: Cédric Jeanneret <cedric.jeanneret@camptocamp.com>
Date: Wed, 1 Dec 2010 11:33:08 +0000 (+0100)
Subject: dhcp - updated template for debian configuration
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f156567a335c6b6bfe3ea578ad73b5c7ae707a02;p=puppet-dhcp.git

dhcp - updated template for debian configuration
---

diff --git a/templates/dhcpd.conf.debian.erb b/templates/dhcpd.conf.debian.erb
index 7606c0c..ee95bee 100644
--- a/templates/dhcpd.conf.debian.erb
+++ b/templates/dhcpd.conf.debian.erb
@@ -18,8 +18,8 @@ authoritative;
 #authoritative;
 <% end -%>
 
-<% if dhcpd_opts and not dhcpd_opts.empty? -%>
-<%= dhcpd_opts.collect! {|i| "#{i}" }.join(";\n") %>
+<% if has_variable?('dhcpd_opts') and not dhcpd_opts.empty? -%>
+<%= dhcpd_opts.join(";\n") %>
 <% end -%>
 
 # Use this to send dhcp log messages to a different log file (you also