X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=cfed6dca8c415acbba61bd78dd51c6bc03cfd97c;hb=09a1d7f58dd757a6d861cdfdfbecd56b5f622d62;hp=a91a16378e05d1e423a4262c71da9c1eba8c2e4f;hpb=c54dc85e499b9c2ffe041ded769cf1da1453609d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index a91a16378..cfed6dca8 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -50,7 +50,7 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
   if p.delete('buildd')
     entries += ", the Debian #{arch} build daemon"
   end
-  if p.delete('porterbox') or scope.lookupvar('site::nodeinfo').has_key?('porterbox')
+  if p.delete('porterbox') or classes.include?("porterbox")
     entries += ", the Debian #{arch} porterbox"
   end
 
@@ -129,7 +129,7 @@ if scope.lookupvar('::cluster').to_s != 'undefined'
 end
 
 
-if scope.lookupvar('site::nodeinfo').has_key?('porterbox')
+if classes.include?("porterbox")
   purp += "\n " + wrap("Disk space on porter boxes is often limited.  Please respect your fellow porters by cleaning up after yourself and deleting schroots and source/build trees in your ~ as soon as feasible.  DSA reserves the right to recover disk space as necessary.  See <URL:http://dsa.debian.org/doc/schroot/> for a brief tutorial on using schroot.")
 end