Changed location for pygrub

[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 0d4d466..cc12679 100644 (file)
--- 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
@@ -49,7 +49,7 @@ if machine_type.hvm:
 else:
     codepath = 'paravm'
 
-if 'mirror' in locals(): #Installer
+if 'installer_options' in locals(): #Installer
     disk.append('phy:/dev/xenvg/s_install_hda,hdb,r')
 
     kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy
@@ -61,10 +61,7 @@ if 'mirror' 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 += ' mirror=%s dist=%s' % (mirror, dist)
-    extra += ' imagesize=%s' % imagesize
-    if 'noinstall' in locals():
-        extra += ' noinstall'
+    extra += ' %s' % installer_options
     root = '/dev/hdb1'
     codepath = None
 elif cdrom is not None:
@@ -82,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: