X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/b0de0658bb284ed8a7f21b9fe5d9303f006b65cc..bab93171a225d7f966f051def21acb5144986145:/client/etc/xen/sipb-database

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 1928bba..6753254 100644
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -18,9 +18,7 @@ def check(b):
 
 machine = models.Machine.get_by(name=machine_name)
 check(machine is not None)
-hvm = machine.type.hvm
-if 'cdrom_image' in locals():
-    hvm = True
+machine_type = models.Type.get_by(type_id=machine.type_id)
 
 memory = machine.memory
 maxmem = memory
@@ -34,57 +32,65 @@ vcpus = machine.cpus
 diskioemu = ""
 viftype = ""
 
-if hvm:
+pae = machine_type.pae
+acpi = machine_type.acpi
+apic = machine_type.apic
+
+vif = []
+
+disk = []
+
+if machine_type.hvm:
+    codepath = 'hvm'
+else:
+    codepath = 'paravm'
+
+if 'mirror' in locals(): #Installer
+    disk.append('phy:/dev/xenvg/d_foobar4_hda,hdb,r')
+
+    kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy
+    ramdisk = '/boot/initrd.img-2.6.24-19-xen'
+
+    if not machine.nics:
+        raise RuntimeError('You must have a nic to autoinstall')
+    n = machine.nics[0]
+    extra = 'ro noresume'
+    extra += ' ip=%s::18.181.0.1:255.255.0.0:%s:eth0:off' % (n.ip, machine.name)
+    extra += ' mirror=%s dist=%s' % (mirror, dist)
+    extra += ' imagesize=%s' % imagesize
+    #extra += ' noinstall'
+    root = '/dev/hdb1'
+    codepath = None
+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')
+    boot = 'd'
+    codepath = 'hvm'
+
+if codepath == 'hvm':
     ioemu = "ioemu:"
     viftype = "type=ioemu, "
-
     kernel = 'hvmloader'
     builder = 'hvm'
     vnc = 1
     vncpasswd = 'moocow'
     device_model = '/usr/sbin/qemu-dm-sipb'
-    serial = 'pty'
-else:
-    kernel  = '/boot/vmlinuz-2.6.18-5-xen-amd64'
-    ramdisk = '/boot/initrd.img-2.6.18-5-xen-amd64'
-    builder = 'linux'
+    serial = "pty"
+elif codepath == 'paravm':
+    bootloader = '/usr/lib/xen-default/bin/pygrub'
 
-pae = machine.type.pae
-acpi = machine.type.acpi
-apic = machine.type.apic
-
-vif = []
 
 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, bridge=xenbr0, script=vif-sipbroute' % (viftype, n.mac_addr, n.ip)
     vif.append(d)
 
-disk = []
-
 for d in machine.disks:
     check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
     device = '/dev/xenvg/' + prefix + machine.name + '_' + d.guest_device_name
     dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name)
     disk.append(dspec)
 
-if 'installer' in locals():
-    check(re.match('^[A-Za-z0-9][A-Za-z0-9_.-]*$', installer))
-    tmptree = tempfile.mkdtemp('', 'auto-install.', '/tmp')
-    call(['/usr/sbin/sipb-xen-make-iso', installer, tmptree]
-         + 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')
-    boot = 'd'
-
 usbdevice = 'tablet'
 
 on_poweroff = 'destroy'