From: Adam Glasgall <glasgall@mit.edu>
Date: Mon, 25 Mar 2013 00:32:30 +0000 (-0400)
Subject: s/// out gunk that breaks mako from xend-config.sxp
X-Git-Tag: 0.0.40~13
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-xen-config.git/commitdiff_plain/3eaf51ca14e9a87597f277ce76a8b071e8cc9e7b

s/// out gunk that breaks mako from xend-config.sxp
---

diff --git a/debian/changelog b/debian/changelog
index a4bfc8a..909e9e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-xen-config (0.0.38~glasgall5) precise; urgency=low
+
+  * s/// out the "${XEN_CONFIG_DIR}" reference that was making mako choke
+
+ -- Adam Glasgall <glasgall@mit.edu>  Sun, 24 Mar 2013 20:31:31 -0400
+
 invirt-xen-config (0.0.38~glasgall4) precise; urgency=low
 
   * Oops, no, we don't actually want to uninstall grub. Depend on grub-pc
diff --git a/debian/transform_xend-config.sxp.invirt.mako b/debian/transform_xend-config.sxp.invirt.mako
index cd0a632..45c0d1e 100755
--- a/debian/transform_xend-config.sxp.invirt.mako
+++ b/debian/transform_xend-config.sxp.invirt.mako
@@ -20,4 +20,5 @@ 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/^\(dom0-min-mem [0-9]*\)/(dom0-min-mem 1536)/m or die;
+s/\$(\{XEN_CONFIG_DIR\})/$1/m or die;
 print;