Don't try to boot up the machine if we're running the autoinstaller

svn path=/trunk/packages/sipb-xen-www/; revision=1140

diff --git a/code/controls.py b/code/controls.py
index 9f5bc48..d21eb7a 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -144,8 +144,9 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
     makeDisks(machine)
     if autoinstall:
         lvinstall(machine, autoinstall)
     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():
     return machine
 
 def getList():