lib/testlab/provisioners/templates/resolv/provision.erb in testlab-1.4.3 vs lib/testlab/provisioners/templates/resolv/provision.erb in testlab-1.4.4
- old
+ new
@@ -1,11 +1,11 @@
set -x
+set -e
dpkg --status bind9 &> /dev/null || <%= (@resolv[:object] == :container).inspect %>
-if [ $? -eq 0 ]; then
- cat << EOF | tee /etc/resolv.conf
+cat <<EOF | tee /etc/resolv.conf
<%= ZTK::Template.do_not_edit_notice(:message => "TestLab Resolv Provisioner") %>
<% if !@resolv[:domain].nil? -%>
domain <%= @resolv[:domain] %>
<% end -%>
<% if !@resolv[:search].nil? -%>
@@ -15,6 +15,5 @@
<% @resolv[:servers].flatten.compact.uniq.each do |server| -%>
nameserver <%= server %>
<% end -%>
<% end -%>
EOF
-fi