From: Adam Glasgall <glasgall@mit.edu>
Date: Sat, 13 Apr 2013 21:41:33 +0000 (-0400)
Subject: explicitly enable network-bridge
X-Git-Tag: 0.0.40~12
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-xen-config.git/commitdiff_plain/e724d71aed619b39054bb1bbe898324c2fbfaaea?ds=sidebyside;hp=-c

explicitly enable network-bridge
---

e724d71aed619b39054bb1bbe898324c2fbfaaea
diff --git a/debian/changelog b/debian/changelog
index 909e9e8..80053fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-xen-config (0.0.38~glasgall6) precise; urgency=low
+
+  * Enable network-bridge in xend-config.sxp, since Precise doesn't by 
+    default anymore.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Sat, 13 Apr 2013 17:40:33 -0400
+
 invirt-xen-config (0.0.38~glasgall5) precise; urgency=low
 
   * s/// out the "${XEN_CONFIG_DIR}" reference that was making mako choke
diff --git a/debian/transform_xend-config.sxp.invirt.mako b/debian/transform_xend-config.sxp.invirt.mako
index 45c0d1e..6400043 100755
--- a/debian/transform_xend-config.sxp.invirt.mako
+++ b/debian/transform_xend-config.sxp.invirt.mako
@@ -19,6 +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-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;