point to ssh console in a paravm's info page

svn path=/trunk/packages/invirt-web/; revision=1789

diff --git a/code/templates/info.tmpl b/code/templates/info.tmpl
index 9346129..d115955 100644 (file)
--- a/code/templates/info.tmpl
+++ b/code/templates/info.tmpl
@@ -20,9 +20,13 @@ Info on $machine.name
   <input type="hidden" name="machine_id" value="$machine.machine_id"/>
   <table>
     
   <input type="hidden" name="machine_id" value="$machine.machine_id"/>
   <table>
     

-    <tr><td colspan=3>
+    <tr><td colspan=100>

        #if $on
        #if $on

-       #if $has_vnc
+        #if not $machine.type.hvm
+        Console access: type
+        <tt>ssh $machine.name@$config.console.hostname</tt>
+        on Athena. <a href="https://xvm.scripts.mit.edu/wiki/SerialConsole">(more info)</a>
+       #elif $has_vnc

        <strong><a href="vnc?machine_id=$machine.machine_id">Get Console</a></strong>
        #else
        VNC console not enabled; still booting?
        <strong><a href="vnc?machine_id=$machine.machine_id">Get Console</a></strong>
        #else
        VNC console not enabled; still booting?

diff --git a/config.todo b/config.todo
index 733ea09..a1f921c 100644 (file)
--- a/config.todo
+++ b/config.todo
@@ -16,3 +16,4 @@ code/templates/unauth.tmpl: https://xvm.mit.edu
 code/getafsgroups.py: lockers, /mit
 code/getafsgroups.py: use of pts for authz
 code/main.py: lockers, pts, in help text
 code/getafsgroups.py: lockers, /mit
 code/getafsgroups.py: use of pts for authz
 code/main.py: lockers, pts, in help text

+code/templates/info.tmpl: "Athena" in help text; really we need to separate code/skin/messages