fix diversion

[invirt/packages/invirt-xen-config.git] / invirt-database

diff --git a/invirt-database b/invirt-database
index e4eed03..599d0b7 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -14,18 +14,18 @@ def check(b):
         import sys
         sys.exit(1)
 
         import sys
         sys.exit(1)
 

-machine = models.Machine.query().filter_by(name=machine_name).one()
+machine = models.Machine.query.filter_by(name=machine_name).one()

 check(machine is not None)
 machine_type = machine.type
 cdrom = None
 if 'cdrom_image' in locals():
 check(machine is not None)
 machine_type = machine.type
 cdrom = None
 if 'cdrom_image' in locals():

-    cdrom = models.CDROM.query().filter_by(cdrom_id=cdrom_image).one()
+    cdrom = models.CDROM.query.filter_by(cdrom_id=cdrom_image).one()

     check(cdrom is not None)
 
 memory = machine.memory
 maxmem = '2048'
 check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
     check(cdrom is not None)
 
 memory = machine.memory
 maxmem = '2048'
 check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))

-name = prefix + machine.name
+name = prefix + machine_name

 check(re.match('^[0-9a-f-]+$', machine.uuid))
 uuid = machine.uuid
 
 check(re.match('^[0-9a-f-]+$', machine.uuid))
 uuid = machine.uuid
 

@@ -105,7 +105,7 @@ elif cdrom is not None:
 if codepath == 'hvm':
     ioemu = "ioemu:"
     viftype = "type=ioemu, "
 if codepath == 'hvm':
     ioemu = "ioemu:"
     viftype = "type=ioemu, "

-    kernel = '/usr/lib/xen/boot/hvmloader'
+    kernel = '/usr/lib/xen-4.1/boot/hvmloader'

     builder = 'hvm'
     vnc = 1
     device_model = '/usr/sbin/qemu-dm-invirt'
     builder = 'hvm'
     vnc = 1
     device_model = '/usr/sbin/qemu-dm-invirt'