Don't try to boot up the machine if we're running the autoinstaller
authorEvan Broder <broder@mit.edu>
Sun, 19 Oct 2008 18:21:09 +0000 (14:21 -0400)
committerEvan Broder <broder@mit.edu>
Sun, 19 Oct 2008 18:21:09 +0000 (14:21 -0400)
svn path=/trunk/packages/sipb-xen-www/; revision=1140

code/controls.py

index 9f5bc48..d21eb7a 100644 (file)
@@ -144,8 +144,9 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
     makeDisks(machine)
     if autoinstall:
         lvinstall(machine, autoinstall)
-    # tell it to boot with cdrom
-    bootMachine(machine, cdrom)
+    else:
+        # tell it to boot with cdrom
+        bootMachine(machine, cdrom)
     return machine
 
 def getList():