include a return address in error mail

[invirt/packages/invirt-web.git] / code / main.py

diff --git a/code/main.py b/code/main.py
index 2875c16..a324306 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -431,11 +431,13 @@ def helpHandler(username, state, path, fields):
 The autoinstaller builds a minimal Debian or Ubuntu system to run as a
 ParaVM.  You can access the resulting system by logging into the <a
 href="help?simple=true&subject=ParaVM+Console">serial console server</a>
-with your Kerberos tickets; there is no root password and no sshd.</p>
+with your Kerberos tickets; there is no root password so sshd will
+refuse login.</p>
 
-<p>Under the covers the autoinstaller uses our own patched version of
-xen-create-image, which is a tool based on debootstrap.  If you're
-quick in logging into the serial console, you can see it running.
+<p>Under the covers, the autoinstaller uses our own patched version of
+xen-create-image, which is a tool based on debootstrap.  If you log
+into the serial console while the install is running, you can watch
+it.
 """,
                     'ParaVM Console': """
 ParaVM machines do not support local console access over VNC.  To
@@ -643,7 +645,8 @@ Subject: %s
 
 %s
 """ % (to, config.web.hostname, subject, body)
-    p = subprocess.Popen(['/usr/sbin/sendmail', to], stdin=subprocess.PIPE)
+    p = subprocess.Popen(['/usr/sbin/sendmail', '-f', to, to],
+                         stdin=subprocess.PIPE)
     p.stdin.write(mail)
     p.stdin.close()
     p.wait()