Forgot to actually add the path onto the sysvms for generating the

[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 787343d..02dedc1 100755 (executable)
--- a/debian/invirt-xen-config.init
+++ b/debian/invirt-xen-config.init
@@ -11,18 +11,58 @@
 
 PACKAGE=invirt-xen-config
 NAME="$PACKAGE"
-DESC="Startup script for the Invirt Xen host"
+DESC="Invirt Xen host"
 PARENTPACKAGE=xend
-GEN_FILES=/etc/xen/xend-config.sxp.invirt
+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]="/etc/xen/sysvms/$vm"
+    i=$((i + 1))
+done
 
 dpkg -s "$PACKAGE" >/dev/null 2>/dev/null || exit 0
 
 . /lib/init/gen-files.sh
 . /lib/init/std-init.sh
 
+start_sysvm() {
+    # Attempt to start a sysvm, but only if it's not running already
+    # somewhere on the cluster
+    
+    VM="$1"
+    DISK="/dev/xenvg/${VM}_hda"
+    
+    # Don't bother trying to start the VM if it's already running
+    if xm list "$1" >/dev/null 2>&1; then
+        return 1
+    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
+        [ "$VERBOSE" != no ] && log_daemon_msg "Starting sysvm $VM"
+        xm create "sysvms/$VM" >/dev/null
+        [ "$VERBOSE" != no ] && log_end_msg $?
+        RET=0
+    else
+        RET=1
+    fi
+    
+    # Regardless of whether we could get the lock or not, the
+    # lvchange -a n probably disabled the LV somewhere; be sure we
+    # clean up
+    lvchange -a y "$DISK" >/dev/null 2>&1
+    
+    return $RET
+}
+
 do_startup() {
     gen_files
     
+    for vm in "${SYSVMS[@]}"; do
+        start_sysvm "$vm"
+    done
+    
     echo 1 >/proc/sys/net/ipv4/ip_forward
     for i in all default; do
         echo 1 >/proc/sys/net/ipv4/conf/$i/rp_filter