X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/dfcbc828924123457c9bf58b183b37ee4223948f..4ce4ff22c2a6d47c549b109c71bca31e40846ed6:/client/etc/xen/sipb-database diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database index 54c1b74..723eb78 100644 --- a/client/etc/xen/sipb-database +++ b/client/etc/xen/sipb-database @@ -2,6 +2,8 @@ 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_" @@ -63,7 +65,15 @@ for d in machine.disks: 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'