X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/8fffbd0901b55badc06724322a34e898af443dfe..505f00e6e4322292bf84295d9325f634653080be:/client/etc/xen/sipb-database

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 451762d..57602b0 100644
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -2,16 +2,19 @@
 import sipb_xen_database.models as models
 from sipb_xen_database import connect
 import re
-import sys
+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
 
 def check(b):
     if not b:
-        exit(1)
+        import sys
+        sys.exit(1)
 
 machine = models.Machine.get_by(name=machine_name)
 check(machine is not None)
@@ -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
 
@@ -39,8 +42,8 @@ if machine_type.hvm:
     vncpasswd = 'moocow'
     device_model = '/usr/sbin/qemu-dm-sipb'
 else:
-    kernel  = '/boot/vmlinuz-2.6.18-4-xen-amd64'
-    ramdisk = '/boot/initrd.img-2.6.18-4-xen-amd64'
+    kernel  = '/boot/vmlinuz-2.6.18-5-xen-amd64'
+    ramdisk = '/boot/initrd.img-2.6.18-5-xen-amd64'
     builder = 'linux'
 
 pae = machine_type.pae
@@ -58,11 +61,23 @@ 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 'disks' in locals(): # for the copying installer's use
+    disk = disks.split(' ')
+    boot = 'c'
+
+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'