X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=496b5dde6e608cfc6fb4e5a11beaaf8944597a78;hb=9d82937165f5d14ac208eea79b14b0fd59006e36;hp=636cdb64b9bdb5fa1d9d832f4cda958061384833;hpb=767eac9dbdbc0916e27ca9a423713069a9145370;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 636cdb64b..496b5dde6 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -12,12 +12,8 @@ def wrap(s, width=78)
 end
 
 def markup(l)
-  if l =~ /\[\[(\*|-)?(.*?)\]\]/
-    l = $2
-  end
-  if l =~ /\[\[(.*?)\|(.*?)\]\]/
-    l = $2
-  end
+  l = l.gsub(/\[\[(.*?)\|(.*?)\]\]/, '\2')
+  l = l.gsub(/\[\[(\*|-)?(.*?)\]\]/, '\2')
   return l
 end
 
@@ -41,7 +37,7 @@ if (nodeinfo['ldap'].has_key?('purpose'))
     end
     purp += " porterbox\n"
     purp += "\n"
-    purp += "See 'dchroot -l' for a list of available chroots.\n"
+    purp += "See 'dchroot -l' or 'schroot -l' for a list of available chroots.\n"
     if nodeinfo['ldap'].has_key?('admin')
       purp += "Please contact #{nodeinfo['ldap']['admin'][0]} for install requests,\n"
       purp += "following the recommendations in <URL:http://dsa.debian.org/doc/install-req/>.\n"
@@ -71,12 +67,12 @@ end
 unless vms.empty?
   purp += "\nThe following virtual machines run on this system:\n"
   vms.each do |node|
-    purp += "\t#{node}"
+    purp += "\t- #{node}"
     if allnodeinfo[node]['purpose']
       purp += ":\n"
       allnodeinfo[node]['purpose'].sort.each do |l|
         l = markup(l)
-        purp += "\t - " + l + "\n"
+        purp += "\t    " + l + "\n"
       end
     else
       purp += "\n"