Index: trunk/packages/sipb-xen-database/client/etc/xen/sipb-database
===================================================================
--- trunk/packages/sipb-xen-database/client/etc/xen/sipb-database	(revision 1089)
+++ trunk/packages/sipb-xen-database/client/etc/xen/sipb-database	(revision 1090)
@@ -19,5 +19,9 @@
 machine = models.Machine.query().filter_by(name=machine_name).one()
 check(machine is not None)
-machine_type = models.Type.query().filter_by(type_id=machine.type_id).one()
+machine_type = machine.type
+cdrom = None
+if 'cdrom_image' in locals():
+    cdrom = models.CDROM.query().filter_by(name=cdrom_image).one()
+    check(cdrom is not None)
 
 memory = machine.memory
@@ -64,7 +68,6 @@
     root = '/dev/hdb1'
     codepath = None
-elif 'cdrom_image' in locals():
-    check(re.match('^[A-Za-z0-9][A-Za-z0-9_.-]*$', cdrom_image))
-    disk.append('phy:/srv/images/' + cdrom_image + '.iso,hdc:cdrom,r')
+elif cdrom is not None:
+    disk.append('phy:/etc/xenvg/image_' + cdrom.cdrom_id + ',hdc:cdrom,r')
     boot = 'd'
     codepath = 'hvm'
Index: trunk/packages/sipb-xen-database/debian/changelog
===================================================================
--- trunk/packages/sipb-xen-database/debian/changelog	(revision 1089)
+++ trunk/packages/sipb-xen-database/debian/changelog	(revision 1090)
@@ -1,2 +1,9 @@
+sipb-xen-database (10.30) unstable; urgency=low
+
+  * Look for CD images in /dev/xenvg/image_* and validate image name from
+    the database
+
+ -- Evan Broder <broder@mit.edu>  Thu, 09 Oct 2008 02:08:49 -0400
+
 sipb-xen-database (10.29) unstable; urgency=low