correct regexp

diff --git a/debian/changelog b/debian/changelog
index 80053fc..7364944 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-xen-config (0.0.38~glasgall7) precise; urgency=low
+
+  * Correct regexp in s/// over xend-config.sxp
+
+ -- Adam Glasgall <glasgall@mit.edu>  Sat, 13 Apr 2013 17:46:43 -0400
+

 invirt-xen-config (0.0.38~glasgall6) precise; urgency=low
 
   * Enable network-bridge in xend-config.sxp, since Precise doesn't by 
 invirt-xen-config (0.0.38~glasgall6) precise; urgency=low
 
   * Enable network-bridge in xend-config.sxp, since Precise doesn't by 

diff --git a/debian/transform_xend-config.sxp.invirt.mako b/debian/transform_xend-config.sxp.invirt.mako
index 6400043..92a3417 100755 (executable)
--- 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/^\#?\(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/^\#?\(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;
 s/^\(dom0-min-mem [0-9]*\)/(dom0-min-mem 1536)/m or die;
 s/\$(\{XEN_CONFIG_DIR\})/$1/m or die;
 print;