X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/40a818ca1cbc08fc24d3ce37f474785afeef879b..4ce4ff22c2a6d47c549b109c71bca31e40846ed6:/client/etc/xen/sipb-database?ds=sidebyside

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 164cef0..723eb78 100644
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -2,8 +2,11 @@
 import sipb_xen_database.models as models
 from sipb_xen_database import connect
 import re
+import tempfile
+from subprocess import call
 
 connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+prefix = "d_"
 
 # 'machine_name', and optionally 'cdrom_image', should get passed in
 # from the xm create call
@@ -20,7 +23,7 @@ machine_type = models.Type.get_by(type_id=machine.type_id)
 memory = machine.memory
 maxmem = memory
 check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
-name = machine.name
+name = prefix + machine.name
 check(re.match('^[0-9a-f-]+$', machine.uuid))
 uuid = machine.uuid
 
@@ -58,11 +61,19 @@ disk = []
 
 for d in machine.disks:
     check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
-    device = '/dev/xenvg/' + machine.name + '_' + d.guest_device_name
+    device = '/dev/xenvg/' + prefix + machine.name + '_' + d.guest_device_name
     dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name)
     disk.append(dspec)
 
-if 'cdrom_image' in locals():
+if 'installer' in locals():
+    check(re.match('^[A-Za-z0-9][A-Za-z0-9_.-]*$', installer))
+    tmptree = tempfile.mkdtemp('', 'auto-install.', '/tmp')
+    call(['/usr/sbin/sipb-xen-make-iso', installer, tmptree]
+         + installer_options.split(' '))
+    disk.append('file:'+tmptree+'/install.iso,hdc:cdrom,r')
+    boot = 'd'
+    
+elif 'cdrom_image' in locals():
     check(re.match('^[A-Za-z0-9][A-Za-z0-9_.-]*$', cdrom_image))
     disk.append('file:/srv/images/' + cdrom_image + '.iso,hdc:cdrom,r')
     boot = 'd'