X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/c4247c60920b72ab783f2c2f70167508ad1f7e1c..87f5f2ecd88d621e375f43a0dda7e3bcf7d1c070:/code/main.py diff --git a/code/main.py b/code/main.py index 438144a..b0fa833 100755 --- a/code/main.py +++ b/code/main.py @@ -12,6 +12,7 @@ import simplejson import sys import time import urllib +import os from StringIO import StringIO def revertStandardError(): @@ -479,7 +480,7 @@ power on and off the machine. This can be either a user or a moira group.""", 'Quotas': """ Quotas are determined on a per-locker basis. Each locker may have a -maximum of 512 megabytes of active ram, 50 gigabytes of disk, and 4 +maximum of 512 mebibytes of active ram, 50 gibibytes of disk, and 4 active machines.""", 'Console': """ Framebuffer: At a Linux boot prompt in your VM, try @@ -488,7 +489,7 @@ your machine will run just fine, but the applet's display of the console will suffer artifacts. """, 'Windows': """ -Windows Vista: The Vista image is licensed for all MIT students and will automatically activate off the network; see the licensing confirmation e-mail for details. The installer req uires 512 MB RAM and at least 7.5 GB disk space (15 GB or more recommended).
+Windows Vista: The Vista image is licensed for all MIT students and will automatically activate off the network; see the licensing confirmation e-mail for details. The installer requires 512 MiB RAM and at least 7.5 GiB disk space (15 GiB or more recommended).
Windows XP: This is the volume license CD image. You will need your own volume license key to complete the install. We do not have these available for the general MIT community; ask your department if they have one. """ } @@ -606,7 +607,8 @@ def info(username, state, path, fields): def unauthFront(_, _2, _3, fields): """Information for unauth'd users.""" - return templates.unauth(searchList=[{'simple' : True}]) + return templates.unauth(searchList=[{'simple' : True, + 'hostname' : os.uname()[1]}]) def admin(username, state, path, fields): if path == '':