Try to run bacula-fd as bacula, not root

[mirror/dsa-puppet.git] / modules / motd / templates / motd.erb

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 9255b9b..42edb0c 100644 (file)
--- 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 <<EOD
@@ -52,10 +52,11 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
     if classes.include?("porterbox")
       extra += "See 'schroot -l' for a list of available chroots.  Start new sessions\n"
       extra += "with 'schroot --begin-session -c <chroot>', run commands in sessions using\n"
-      extra += "\schroot --run-session -c <session> [-- command]\, and tear down sessions\n"
-      extra += "using \schroot --end-session -c <session>'.  You can run a limited set of\n"
+      extra += "'schroot --run-session -c <session> [-- command]', and tear down sessions\n"
+      extra += "using 'schroot --end-session -c <session>'.  You can run a limited set of\n"
       extra += "privileged commands, for instance some of apt-get, using\n"
-      extra += "'dd-schroot-cmd -c <session> <command>'."
+      extra += "'dd-schroot-cmd -c <session> <command>'.\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')
@@ -144,7 +145,7 @@ purp
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-<% if @lsbdistcodename == 'wheezy' -%>
+<% if @lsbmajdistrelease >= '7' -%>
 EOD
 <% end -%>
 <%