Changeset 1090 for trunk/packages/sipb-xen-database/client/etc/xen/sipb-database

Timestamp:

Oct 9, 2008, 2:12:36 AM (16 years ago)

Author:

broder

Message:

Look for CD images in /dev/xenvg/image_* and validate them against the
database

File:

• trunk/packages/sipb-xen-database/client/etc/xen/sipb-database (modified) (2 diffs)

trunk/packages/sipb-xen-database/client/etc/xen/sipb-database

@@ -19 +19 @@
 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 +68 @@
     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'