X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/4ce4ff22c2a6d47c549b109c71bca31e40846ed6..66f5e78c135654c299f0e55eb11097d6fe2e6640:/client/etc/xen/sipb-database diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database index 723eb78..57602b0 100644 --- 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: - 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 @@ -72,7 +72,11 @@ if 'installer' in locals(): + 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')