X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/a964d744e6f3594a58e7c0b8c121a429a2770227..075f6b8135bc61fa46dcd3aa4a79b9fcf8f43aa6:/client/etc/xen/sipb-database

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index fbc8079..9006232 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
@@ -61,7 +61,7 @@ if 'installer_options' in locals(): #Installer
     extra = 'ro noresume'
     extra += (' ip=%s::%s:%s:%s:eth0:off'
          % (n.ip, config.dhcp.gateway, config.dhcp.netmask, machine.name))
-    extra += ' %s' % installer_options[1:-1]
+    extra += ' %s' % installer_options
     root = '/dev/hdb1'
     codepath = None
 elif cdrom is not None: