I suspect that while the inline read was shorter, it was leaking fds

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/templates/motd.erb b/templates/motd.erb
index 1881c41b37ec7b4378eb2ed5be147e75a21838c0..a0a7a72554956526c4366a3aed6f0a7b3a7e2625 100644 (file)
--- a/templates/motd.erb
+++ b/templates/motd.erb
@@ -3,6 +3,8 @@ is monitored and will be used as evidence for prosecutions.
 
 <% if File.exists?("/etc/puppet/modules/motd/files/" + fqdn + "/motd.tail") -%>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-<%= File.open("/etc/puppet/modules/motd/files/" + fqdn + "/motd.tail").read -%>
+<% f = File.open("/etc/puppet/modules/motd/files/" + fqdn + "/motd.tail") -%>
+<%= f.read -%>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+<% f.close -%>
 <% end -%>