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 4bf7382..cc12679 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(cdrom_id=cdrom_image).one()
+    check(cdrom is not None)

 
 memory = machine.memory
 maxmem = memory
 
 memory = machine.memory
 maxmem = memory

@@ -45,7 +49,7 @@ if machine_type.hvm:
 else:
     codepath = 'paravm'
 
 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
     disk.append('phy:/dev/xenvg/s_install_hda,hdb,r')
 
     kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy

@@ -57,15 +61,11 @@ 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 = '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
     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('phy:/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'
 

@@ -79,7 +79,7 @@ if codepath == 'hvm':
     device_model = '/usr/sbin/qemu-dm-sipb'
     serial = "pty"
 elif codepath == 'paravm':
     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:
 
 
 for n in machine.nics: