point to ssh console in a paravm's info page

[invirt/packages/invirt-web.git] / code / templates / info.tmpl

diff --git a/code/templates/info.tmpl b/code/templates/info.tmpl
index b65299c..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>
     
-    <tr><td colspan=3>
+    <tr><td colspan=100>
        #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?
@@ -65,6 +69,7 @@ $cdromList()#slurp
 <form action="modify" method="POST">
   <input type="hidden" name="machine_id" value="$defaults.machine_id"/>
   <table>
+    <tr><td>Description:</td><td colspan="2"><textarea name="description" rows="4" cols="60">$defaults.description</textarea></td></tr>
     <tr><td>Owner#slurp
 #filter None
 $helppopup("Owner")#slurp
@@ -86,7 +91,7 @@ $errorRow('administrator', $err)
 $errorRow('contact', $err)
 #end filter
 #if not $on
-    <tr><td>Machine Name:</td><td><input type="text" name="name" value="$defaults.name"/></td></tr>
+    <tr><td>Machine Name:</td><td><input type="text" name="name" value="$defaults.name"/>.${config.dns.domains[0]}</td></tr>
 #filter None
 $errorRow('name', $err)
 #end filter