Correctly calculate the lists of both the sysvms to startup and the

Mako templates to render in the invirt-xen-config startup script.

svn path=/trunk/packages/invirt-xen-config/; revision=2085

diff --git a/debian/changelog b/debian/changelog
index 1957d9c..a6e9e4d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-xen-config (0.0.22) unstable; urgency=low
+
+  * Correctly calculate both the list of sysvms to boot and the list of
+    Mako templates to render in the init script.
+
+ -- Evan Broder <broder@mit.edu>  Mon, 02 Feb 2009 17:30:51 -0500
+

 invirt-xen-config (0.0.21) unstable; urgency=low
 
   * Move sysvms/* into xvm-prodconfig from invirt-xen-config
 invirt-xen-config (0.0.21) unstable; urgency=low
 
   * Move sysvms/* into xvm-prodconfig from invirt-xen-config

diff --git a/debian/invirt-xen-config.init b/debian/invirt-xen-config.init
index 0613ff9..567d7d2 100755 (executable)
--- a/debian/invirt-xen-config.init
+++ b/debian/invirt-xen-config.init
@@ -13,9 +13,10 @@ PACKAGE=invirt-xen-config
 NAME="$PACKAGE"
 DESC="Invirt Xen host"
 PARENTPACKAGE=xend
 NAME="$PACKAGE"
 DESC="Invirt Xen host"
 PARENTPACKAGE=xend

-SYSVM_FILES=(/etc/xen/sysvms/s_*)
+SYSVM_TEMPLATES=(/etc/xen/sysvms/s_*.mako)
+SYSVM_FILES=("${SYSVM_TEMPLATES[@]/.mako/}")

 SYSVMS=("${SYSVM_FILES[@]/#\/etc\/xen\/sysvms\/}")
 SYSVMS=("${SYSVM_FILES[@]/#\/etc\/xen\/sysvms\/}")

-GEN_FILES=(/etc/xen/xend-config.sxp.invirt)
+GEN_FILES=(/etc/xen/xend-config.sxp.invirt "${SYSVM_FILES[@]}")

 
 dpkg -s "$PACKAGE" >/dev/null 2>/dev/null || exit 0
 
 
 dpkg -s "$PACKAGE" >/dev/null 2>/dev/null || exit 0