X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/3df757befd07a92962aa1b969bacb8115934188f..b30fd0f5ea0ac4b813d8038331e8814662f8f953:/client/etc/xen/sipb-database

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index a4da026..568a68f 100644
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -21,7 +21,7 @@ check(machine is not None)
 machine_type = machine.type
 cdrom = None
 if 'cdrom_image' in locals():
-    cdrom = models.CDROM.query().filter_by(name=cdrom_image).one()
+    cdrom = models.CDROM.query().filter_by(cdrom_id=cdrom_image).one()
     check(cdrom is not None)
 
 memory = machine.memory
@@ -65,7 +65,7 @@ if 'installer_options' in locals(): #Installer
     root = '/dev/hdb1'
     codepath = None
 elif cdrom is not None:
-    disk.append('phy:/etc/xenvg/image_' + cdrom.cdrom_id + ',hdc:cdrom,r')
+    disk.append('phy:/dev/xenvg/image_' + cdrom.cdrom_id + ',hdc:cdrom,r')
     boot = 'd'
     codepath = 'hvm'
 
@@ -79,7 +79,7 @@ if codepath == 'hvm':
     device_model = '/usr/sbin/qemu-dm-sipb'
     serial = "pty"
 elif codepath == 'paravm':
-    bootloader = '/usr/lib/xen-default/bin/pygrub'
+    bootloader = '/usr/bin/pygrub'
 
 
 for n in machine.nics: