Update the sipb-database script to match the remctl interface

[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..fbc8079 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -49,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

@@ -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 = '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[1:-1]

     root = '/dev/hdb1'
     codepath = None
 elif cdrom is not None:
     root = '/dev/hdb1'
     codepath = None
 elif cdrom is not None: