From: Adam Glasgall <glasgall@mit.edu>
Date: Mon, 6 May 2013 23:15:41 +0000 (-0400)
Subject: re-disable enabling network-bridge. irony.
X-Git-Tag: 0.0.40~5
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-xen-config.git/commitdiff_plain/b13bd7e555c9df527bcda8b0db1889e1b59f85ed

re-disable enabling network-bridge. irony.
---

diff --git a/debian/changelog b/debian/changelog
index f8bd430..b03e8b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
-invirt-xen-config (0.0.38~glasgall11ubuntu1) UNRELEASED; urgency=low
+invirt-xen-config (0.0.38~glasgall13) precise; urgency=low
+
+  * Undo enabling network-bridge; we want to manage our own bridge config
+    now. Oh, irony.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Mon, 06 May 2013 19:14:41 -0400
+
+invirt-xen-config (0.0.38~glasgall12) precise; urgency=low
 
   * xm was expecting a string and was getting a unistring for machine
     name, which resulted in the VM name always being
     'invirt-database'. Use passed-in machine_name instead, since that will
     be a string. IBTSOCS.
 
- -- Adam Glasgall <glasgall@mit.edu>  Sat, 27 Apr 2013 00:21:21 -0400
+ -- Adam Glasgall <glasgall@mit.edu>  Mon, 06 May 2013 19:14:23 -0400
 
 invirt-xen-config (0.0.38~glasgall11) precise; urgency=low
 
diff --git a/debian/transform_xend-config.sxp.invirt.mako b/debian/transform_xend-config.sxp.invirt.mako
index dec60ca..41fc9cc 100755
--- a/debian/transform_xend-config.sxp.invirt.mako
+++ b/debian/transform_xend-config.sxp.invirt.mako
@@ -19,7 +19,7 @@ EOF
 
 s/^\#?\(xend-relocation-address ''\)/(xend-relocation-address '\${internal_ip}')/m or die;
 s/^\#?\(xend-relocation-hosts-allow '[^']*'\)/(xend-relocation-hosts-allow '')/m or die;
-s/^(\# )?\(network-script network-bridge\)/(network-script 'network-bridge')/m or die;
+# s/^(\# )?\(network-script network-bridge\)/(network-script 'network-bridge')/m or die;
 s/^\(dom0-min-mem [0-9]*\)/(dom0-min-mem 1536)/m or die;
 s/\$(\{XEN_CONFIG_DIR\})/$1/m or die;
 print;