Don't create iptables rules in vif-invirtroute - they don't do anything.

[invirt/packages/invirt-xen-config.git] / invirt-database

diff --git a/invirt-database b/invirt-database
index 5ee57f9..4b86a85 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -64,6 +64,8 @@ if 'installer_options' in locals(): #Installer
     extra += ' %s' % installer_options
     root = '/dev/hdb1'
     codepath = None
     extra += ' %s' % installer_options
     root = '/dev/hdb1'
     codepath = None

+
+    memory = max(memory, 512)

 elif cdrom is not None:
     disk.append('phy:/dev/xenvg/image_' + cdrom.cdrom_id + ',hdc:cdrom,r')
     boot = 'd'
 elif cdrom is not None:
     disk.append('phy:/dev/xenvg/image_' + cdrom.cdrom_id + ',hdc:cdrom,r')
     boot = 'd'

@@ -75,7 +77,6 @@ if codepath == 'hvm':
     kernel = '/usr/lib/xen/boot/hvmloader'
     builder = 'hvm'
     vnc = 1
     kernel = '/usr/lib/xen/boot/hvmloader'
     builder = 'hvm'
     vnc = 1

-    vncpasswd = 'moocow'

     device_model = '/usr/sbin/qemu-dm-invirt'
     serial = "pty"
 elif codepath == 'paravm':
     device_model = '/usr/sbin/qemu-dm-invirt'
     serial = "pty"
 elif codepath == 'paravm':