remove apparently obsoleted script sipb-xen-lvcreate

[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 723eb78..57602b0 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -42,8 +42,8 @@ if machine_type.hvm:
     vncpasswd = 'moocow'
     device_model = '/usr/sbin/qemu-dm-sipb'
 else:
     vncpasswd = 'moocow'
     device_model = '/usr/sbin/qemu-dm-sipb'
 else:

-    kernel  = '/boot/vmlinuz-2.6.18-4-xen-amd64'
-    ramdisk = '/boot/initrd.img-2.6.18-4-xen-amd64'
+    kernel  = '/boot/vmlinuz-2.6.18-5-xen-amd64'
+    ramdisk = '/boot/initrd.img-2.6.18-5-xen-amd64'

     builder = 'linux'
 
 pae = machine_type.pae
     builder = 'linux'
 
 pae = machine_type.pae

@@ -72,7 +72,11 @@ if 'installer' in locals():
          + installer_options.split(' '))
     disk.append('file:'+tmptree+'/install.iso,hdc:cdrom,r')
     boot = 'd'
          + installer_options.split(' '))
     disk.append('file:'+tmptree+'/install.iso,hdc:cdrom,r')
     boot = 'd'

-    
+
+elif 'disks' in locals(): # for the copying installer's use
+    disk = disks.split(' ')
+    boot = 'c'
+

 elif 'cdrom_image' in locals():
     check(re.match('^[A-Za-z0-9][A-Za-z0-9_.-]*$', cdrom_image))
     disk.append('file:/srv/images/' + cdrom_image + '.iso,hdc:cdrom,r')
 elif 'cdrom_image' in locals():
     check(re.match('^[A-Za-z0-9][A-Za-z0-9_.-]*$', cdrom_image))
     disk.append('file:/srv/images/' + cdrom_image + '.iso,hdc:cdrom,r')