From: Evan Broder <broder@mit.edu>
Date: Sun, 19 Oct 2008 05:47:08 +0000 (-0400)
Subject: Remove bridge specification from sipb-database
X-Git-Tag: sipb-xen-database/10.31^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/commitdiff_plain/6bbac82c83e5a4e1b5bce2a77a65f5601daa2ad6

Remove bridge specification from sipb-database

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

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 568a68f..c2e4c2e 100644
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -84,7 +84,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, bridge=xenbr0, script=vif-sipbroute' % (viftype, n.mac_addr, n.ip)
+    d = '%smac=%s, ip=%s, script=vif-sipbroute' % (viftype, n.mac_addr, n.ip)
     vif.append(d)
 
 for d in machine.disks:
diff --git a/debian/changelog b/debian/changelog
index 5cc6d80..63672c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-database (10.31) unstable; urgency=low
+
+  * Database-managed VMs should never even think about bridging
+
+ -- Evan Broder <broder@mit.edu>  Sun, 19 Oct 2008 01:46:45 -0400
+
 sipb-xen-database (10.30.4) unstable; urgency=low
 
   * Fix a typo in the CDROM image path