simplify some shell code

[invirt/packages/invirt-xen-config.git] / debian / invirt-xen-config.init

diff --git a/debian/invirt-xen-config.init b/debian/invirt-xen-config.init
index 9375e96..430ae9e 100755 (executable)
--- a/debian/invirt-xen-config.init
+++ b/debian/invirt-xen-config.init
@@ -13,13 +13,8 @@ PACKAGE=invirt-xen-config
 NAME="$PACKAGE"
 DESC="Invirt Xen host"
 PARENTPACKAGE=xend
-GEN_FILES=(/etc/xen/xend-config.sxp.invirt)
 SYSVMS=(s_master s_remote s_console)
-i=1
-for vm in "${SYSVMS[@]}"; do
-    GEN_FILES[$i] = "$vm"
-    i=$((i + 1))
-done
+GEN_FILES=(/etc/xen/xend-config.sxp.invirt "${SYSVMS[@]/#//etc/xen/sysvms/}")
 
 dpkg -s "$PACKAGE" >/dev/null 2>/dev/null || exit 0
 
@@ -39,7 +34,11 @@ start_sysvm() {
     fi
     
     if lvchange -a n "$DISK" >/dev/null 2>&1 && lvchange -a ey "$DISK" >/dev/null 2>&1; then
-        # If we can lock on the VM's disk, then the VM isn't running
+        # If we can disable and then re-enable the VMs disk, then the
+        # VM can't be running. If the lvchange -a ey succeeds, then we
+        # have an exclusive lock across the cluster on enabling the
+        # disk, which avoids the potential race condition of two hosts
+        # starting a VM at the same time
         [ "$VERBOSE" != no ] && log_daemon_msg "Starting sysvm $VM"
         xm create "sysvms/$VM" >/dev/null
         [ "$VERBOSE" != no ] && log_end_msg $?