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

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 6753254..2d80d07 100644
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -1,11 +1,10 @@
 # -*- mode: python; -*-
-import sipb_xen_database.models as models
-from sipb_xen_database import connect
+from invirt.database import models, connect
 import re
 import tempfile
 from subprocess import call
 
-connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+connect()
 prefix = "d_"
 
 # 'machine_name', and optionally 'cdrom_image', should get passed in
@@ -46,7 +45,7 @@ else:
     codepath = 'paravm'
 
 if 'mirror' in locals(): #Installer
-    disk.append('phy:/dev/xenvg/d_foobar4_hda,hdb,r')
+    disk.append('phy:/dev/xenvg/d_foobar3_hda,hdb,r')
 
     kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy
     ramdisk = '/boot/initrd.img-2.6.24-19-xen'
@@ -58,7 +57,8 @@ if 'mirror' in locals(): #Installer
     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'
+    if 'noinstall' in locals():
+        extra += ' noinstall'
     root = '/dev/hdb1'
     codepath = None
 elif 'cdrom_image' in locals():