shorten sipb-xen-database-server initscript too

[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 fbc8079..c2e4c2e 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():
 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
     check(cdrom is not None)
 
 memory = machine.memory

@@ -61,11 +61,11 @@ 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 = '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:
     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'
 
     boot = 'd'
     codepath = 'hvm'
 

@@ -79,12 +79,12 @@ 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:
     check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))
 
 
 for n in machine.nics:
     check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))

-    d = '%smac=%s, ip=%s, bridge=xenbr0, script=vif-sipbroute' % (viftype, n.mac_addr, n.ip)
+    d = '%smac=%s, ip=%s, script=vif-sipbroute' % (viftype, n.mac_addr, n.ip)

     vif.append(d)
 
 for d in machine.disks:
     vif.append(d)
 
 for d in machine.disks: