From: Evan Broder <broder@mit.edu>
Date: Mon, 6 Oct 2008 23:03:25 +0000 (-0400)
Subject: Some fixes in the sipb-database Xen config script
X-Git-Tag: sipb-xen-database/10.29^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/commitdiff_plain/fdac617a6d08a9554611810d953be70cb3d20d46

Some fixes in the sipb-database Xen config script

svn path=/trunk/packages/sipb-xen-database/; revision=1079
---

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 70eed41..4bf7382 100644
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -46,7 +46,7 @@ else:
     codepath = 'paravm'
 
 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
     ramdisk = '/boot/initrd.img-2.6.24-19-xen'
@@ -56,7 +56,7 @@ if 'mirror' in locals(): #Installer
     n = machine.nics[0]
     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
     if 'noinstall' in locals():
@@ -65,7 +65,7 @@ if 'mirror' in locals(): #Installer
     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')
+    disk.append('phy:/srv/images/' + cdrom_image + '.iso,hdc:cdrom,r')
     boot = 'd'
     codepath = 'hvm'
 
diff --git a/debian/changelog b/debian/changelog
index 2af5b40..a273028 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-database (10.29) unstable; urgency=low
+
+  * Some fixes in the sipb-database script
+
+ -- Evan Broder <broder@mit.edu>  Mon, 06 Oct 2008 18:55:24 -0400
+
 sipb-xen-database (10.28) unstable; urgency=low
 
   * Re-establish the database connection if the server goes AWOL