X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=42edb0cbc639a4eb80b0bce39a42d9fdd2642d11;hb=796cbf0c10679a34c4cd7757d224432169bc2472;hp=8622602296ecc949c3fcfb1ecd26899b932863c0;hpb=5275770968b17ca00ae43f19c92ffa825cda6f71;p=mirror%2Fdsa-puppet.git
diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 862260229..42edb0cbc 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -1,4 +1,4 @@
-<% if @lsbdistcodename == 'wheezy' -%>
+<% if @lsbmajdistrelease >= '7' -%>
#!/bin/bash
cat <.\n"
+ if classes.include?("porterbox")
+ extra += "See 'schroot -l' for a list of available chroots. Start new sessions\n"
+ extra += "with 'schroot --begin-session -c ', run commands in sessions using\n"
+ extra += "'schroot --run-session -c [-- command]', and tear down sessions\n"
+ extra += "using 'schroot --end-session -c '. You can run a limited set of\n"
+ extra += "privileged commands, for instance some of apt-get, using\n"
+ extra += "'dd-schroot-cmd -c '.\n"
+ extra += "Use 'schroot-list-sessions' to list your open sessions.\n"
+ else
+ extra += "See 'dchroot -l' or 'schroot -l' for a list of available chroots.\n"
+ if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('admin')
+ extra += "Please contact #{ninfo['ldap']['admin'][0]} for install requests,\n"
+ extra += "following the recommendations in .\n"
+ end
end
end
@@ -135,7 +145,7 @@ purp
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-<% if @lsbdistcodename == 'wheezy' -%>
+<% if @lsbmajdistrelease >= '7' -%>
EOD
<% end -%>
<%