Merged in r2821,2824,2827 from hvirt branch.

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

diff --git a/invirt-database b/invirt-database
index 5ee57f9..a0dc979 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
+
+    memory = max(memory, 512)
 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
-    vncpasswd = 'moocow'
     device_model = '/usr/sbin/qemu-dm-invirt'
     serial = "pty"
 elif codepath == 'paravm':
@@ -85,7 +86,7 @@ elif codepath == 'paravm':
 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, script=vif-invirtroute netdev=%s'
-         % (viftype, n.mac_addr, n.ip, config.xen.network.iface))
+         % (viftype, n.mac_addr, n.ip, config.xen.iface))
     vif.append(d)
 
 for d in machine.disks: