From 10a1af41408ed1feed086a361b08e828ce132b58 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Thu, 9 Oct 2008 02:12:36 -0400 Subject: [PATCH] Look for CD images in /dev/xenvg/image_* and validate them against the database svn path=/trunk/packages/sipb-xen-database/; revision=1090 --- client/etc/xen/sipb-database | 11 +++++++---- debian/changelog | 7 +++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database index 4bf7382..0d4d466 100644 --- a/client/etc/xen/sipb-database +++ b/client/etc/xen/sipb-database @@ -18,7 +18,11 @@ def check(b): 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 maxmem = memory @@ -63,9 +67,8 @@ if 'mirror' in locals(): #Installer extra += ' noinstall' 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' diff --git a/debian/changelog b/debian/changelog index a273028..3c1b8ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 Thu, 09 Oct 2008 02:08:49 -0400 + sipb-xen-database (10.29) unstable; urgency=low * Some fixes in the sipb-database script -- 1.7.9.5