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

[invirt/packages/invirt-database.git] / client / etc / xen / sipb-database

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 70eed41..0d4d466 100644 (file)
--- 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 = 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
 
 memory = machine.memory
 maxmem = memory

@@ -46,7 +50,7 @@ else:
     codepath = 'paravm'
 
 if 'mirror' in locals(): #Installer
     codepath = 'paravm'
 
 if 'mirror' in locals(): #Installer

-    disk.append('phy:/dev/xenvg/d_foobar3_hda,hdb,r')
+    disk.append('phy:/dev/xenvg/s_install_hda,hdb,r')

 
     kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy
     ramdisk = '/boot/initrd.img-2.6.24-19-xen'
 
     kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy
     ramdisk = '/boot/initrd.img-2.6.24-19-xen'

@@ -56,16 +60,15 @@ if 'mirror' in locals(): #Installer
     n = machine.nics[0]
     extra = 'ro noresume'
     extra += (' ip=%s::%s:%s:%s:eth0:off'
     n = machine.nics[0]
     extra = 'ro noresume'
     extra += (' ip=%s::%s:%s:%s:eth0:off'

-         % (n.ip, config.network.gateway, config.network.netmask, machine.name))
+         % (n.ip, config.dhcp.gateway, config.dhcp.netmask, machine.name))

     extra += ' mirror=%s dist=%s' % (mirror, dist)
     extra += ' imagesize=%s' % imagesize
     if 'noinstall' in locals():
         extra += ' noinstall'
     root = '/dev/hdb1'
     codepath = None
     extra += ' mirror=%s dist=%s' % (mirror, dist)
     extra += ' imagesize=%s' % imagesize
     if 'noinstall' in locals():
         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('file:/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'
 
     boot = 'd'
     codepath = 'hvm'