Support multiple NICs on HVMs

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

diff --git a/invirt-database b/invirt-database
index 5ee57f9..e4eed03 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -48,22 +48,55 @@ else:
     codepath = 'paravm'
 
 if 'installer_options' in locals(): #Installer
     codepath = 'paravm'
 
 if 'installer_options' in locals(): #Installer

-    disk.append('phy:/dev/xenvg/s_install_hda,hdb,r')
-
-    import os
-    release = os.uname()[2]
-    kernel = '/boot/vmlinuz-%s' % release
-    ramdisk = '/boot/initrd.img-%s' % release
-
-    if not machine.nics:
-        raise RuntimeError('You must have a nic to autoinstall')
-    n = machine.nics[0]
-    extra = 'ro noresume'
-    extra += (' ip=%s::%s:%s:%s:eth0:off'
-         % (n.ip, config.dhcp.gateway, config.dhcp.netmask, machine.name))
-    extra += ' %s' % installer_options
-    root = '/dev/hdb1'
+    import shlex
+    install = dict(x.split("=",1) for x in shlex.split(installer_options))
+    if 'preseed' in install: # d-i based installer
+        baseurl = install['mirror']+"/dists/"+install['dist']+"/main/installer-"+install['arch']+"/current/images"
+        kernelurl = baseurl + "/netboot/xen/vmlinuz"
+        ramdiskurl = baseurl + "/netboot/xen/initrd.gz"
+
+        import urllib
+        class MyUrlOpener(urllib.FancyURLopener):
+            def http_error_default(self, req, fp, code, msg, hdrs):
+                raise IOError("%s %s" % (code, msg))
+        urlopener = MyUrlOpener()
+
+        try:
+            print "Fetching %s" % kernelurl
+            kernel, _ = urlopener.retrieve(kernelurl)
+            print "Fetching %s" % ramdiskurl
+            ramdisk, _ = urlopener.retrieve(ramdiskurl)
+        except IOError, _:
+            raise
+
+        # For debugging, add "DEBCONF_DEBUG=5" to the arguments.
+        extras = ["auto=true",
+                  "debconf/priority=critical",
+                  "debian-installer/locale=en_US.UTF-8",
+                  "debian-installer/exit/always_halt=true",
+                  "url="+install['preseed'],
+                  "--", "console=hvc0"]
+
+        extra = str.join(" ", extras)
+    else: # Traditional debootstrap-based install
+        disk.append('phy:/dev/xenvg/s_install_hda,hdb,r')
+
+        import os
+        release = os.uname()[2]
+        kernel = '/boot/vmlinuz-%s' % release
+        ramdisk = '/boot/initrd.img-%s' % release
+
+        if not machine.nics:
+            raise RuntimeError('You must have a nic to autoinstall')
+        n = machine.nics[0]
+        extra = 'ro noresume'
+        extra += (' ip=%s::%s:%s:%s:eth0:off'
+                  % (n.ip, config.dhcp.gateway, config.dhcp.netmask, machine.name))
+        extra += ' %s' % installer_options
+        root = '/dev/hdb1'

     codepath = None
     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 +108,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':

@@ -85,7 +117,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'
 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:
     vif.append(d)
 
 for d in machine.disks: