From c54dc85e499b9c2ffe041ded769cf1da1453609d Mon Sep 17 00:00:00 2001 From: =?utf8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?= Date: Mon, 27 Oct 2014 16:50:43 +0100 Subject: [PATCH] motd: do not check porterbox class, always included now MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Héctor Orón Martínez --- modules/motd/templates/motd.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb index cfed6dca..a91a1637 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 classes.include?("porterbox") + if p.delete('porterbox') or scope.lookupvar('site::nodeinfo').has_key?('porterbox') entries += ", the Debian #{arch} porterbox" end @@ -129,7 +129,7 @@ if scope.lookupvar('::cluster').to_s != 'undefined' end -if classes.include?("porterbox") +if scope.lookupvar('site::nodeinfo').has_key?('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 for a brief tutorial on using schroot.") end -- 2.39.2