release/004.044

NEWS

-UNRELEASED
+release/004.044 (2015-05-21)
 
     [vmguest] Add a parameter to allow the non-installation of the
     tripwire client. (adamhl)
 
+    Add some @'s to some instance variables in a couple of template
+    files. (adamhl)
+
 release/004.043 (2015-05-15)
 
     [dns] Remove the legacy "C" DNS servers from resolv.conf.  Networking is

templates/os/motd.erb

@@ -21,9 +21,9 @@
       product.gsub!(/Precision WorkStation /i, '')
       product.gsub!(/ MODULE/i, '')
     end
-    sn = serialnumber rescue nil
-    if virtual == 'physical' and (! sn.nil?)
-      product += ", " + serialnumber
+    sn = @serialnumber rescue nil
+    if @virtual == 'physical' and (! sn.nil?)
+      product += ", " + @serialnumber
     end
 
     memory = @memorysize

templates/syslog/rsyslog.conf.erb

@@ -20,9 +20,9 @@ $DirCreateMode 0755
 $WorkDirectory /var/spool/rsyslog
 
 <%# Disable rate limiting on >= Debian Wheezy, Ubuntu Precise and RHEL6. -%>
-<% if ( @operatingsystem == 'Ubuntu' && lsbmajdistrelease.to_i() >= 12 ) ||
-      ( @operatingsystem == 'Debian' && lsbmajdistrelease.to_i() >= 7 ) ||
-      ( @osfamily == 'RedHat' && lsbmajdistrelease.to_i() >= 6 ) then -%>
+<% if ( @operatingsystem == 'Ubuntu' && @lsbmajdistrelease.to_i() >= 12 ) ||
+      ( @operatingsystem == 'Debian' && @lsbmajdistrelease.to_i() >= 7 ) ||
+      ( @osfamily == 'RedHat' && @lsbmajdistrelease.to_i() >= 6 ) then -%>
 # Turn off rate limiting to syslog.  If there are too many messages
 # being written to syslog something is wrong that should be examined
 # and not hidden.  This works only on wheezy and precise and better.