Index: trunk/packages/sipb-xen-database/sipb-xen-database/client/etc/xen/sipb-database
===================================================================
--- trunk/packages/sipb-xen-database/sipb-xen-database/client/etc/xen/sipb-database	(revision 222)
+++ trunk/packages/sipb-xen-database/sipb-xen-database/client/etc/xen/sipb-database	(revision 223)
@@ -3,4 +3,6 @@
 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')
@@ -64,5 +66,13 @@
     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')
Index: trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol
===================================================================
--- trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol	(revision 222)
+++ trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol	(revision 223)
@@ -18,12 +18,16 @@
         xm "$ACTION" "$MACHINE"
 	;;
-    create|reboot)
+    install|create|reboot)
+	ARG="$3"
+	shift; shift; shift; MOREARGS="$*"
 	if [ "$ACTION" = "reboot" ]; then
 	    xm destroy "$MACHINE" 2>/dev/null
 	else
 	    xm list "$MACHINE" >/dev/null 2>/dev/null && echo "$MACHINE already exists" && exit 1
-	fi	
-	if [ -n "$3" ]; then
-	    xm create sipb-database machine_name="$ORIGMACHINE" cdrom_image="$3"
+	fi
+	if [ "$ACTION" = "install" ]; then
+	    xm create sipb-database machine_name="$ORIGMACHINE" installer="$ARG" installer_options="$MOREARGS"
+	elif [ -n "$3" ]; then
+	    xm create sipb-database machine_name="$ORIGMACHINE" cdrom_image="$ARG"
 	else
 	    xm create sipb-database machine_name="$ORIGMACHINE"