Index: trunk/packages/sipb-xen-database/client/etc/xen/sipb-database
===================================================================
--- trunk/packages/sipb-xen-database/client/etc/xen/sipb-database	(revision 1016)
+++ trunk/packages/sipb-xen-database/client/etc/xen/sipb-database	(revision 1079)
@@ -47,5 +47,5 @@
 
 if 'mirror' in locals(): #Installer
-    disk.append('phy:/dev/xenvg/d_foobar3_hda,hdb,r')
+    disk.append('phy:/dev/xenvg/s_install_hda,hdb,r')
 
     kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy
@@ -57,5 +57,5 @@
     extra = 'ro noresume'
     extra += (' ip=%s::%s:%s:%s:eth0:off'
-         % (n.ip, config.network.gateway, config.network.netmask, machine.name))
+         % (n.ip, config.dhcp.gateway, config.dhcp.netmask, machine.name))
     extra += ' mirror=%s dist=%s' % (mirror, dist)
     extra += ' imagesize=%s' % imagesize
@@ -66,5 +66,5 @@
 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')
+    disk.append('phy:/srv/images/' + cdrom_image + '.iso,hdc:cdrom,r')
     boot = 'd'
     codepath = 'hvm'