summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2011-12-23 14:46:59 +0100
committerDominique Martinet <asmadeus@codewreck.org>2011-12-23 14:46:59 +0100
commit03499b0d33d153ccefdba5bbc4419f5d8d487ea6 (patch)
tree662195e202f0e6234b8d21f048d0bc834f5ca904
parentea78a86b7fcf5ab4556a98ec53de79deb82ffb64 (diff)
added back a test that shouldn't have been left out
-rwxr-xr-xkvm-wrapper.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/kvm-wrapper.sh b/kvm-wrapper.sh
index 6600ca1..c17b5e6 100755
--- a/kvm-wrapper.sh
+++ b/kvm-wrapper.sh
@@ -469,7 +469,7 @@ function kvm_start_vm ()
function kvm_stop_vm ()
{
test_exist "$PID_FILE" || fail_exit "VM $VM_NAME doesn't seem to be running.\nPID file $PID_FILE not found"
-# test_socket_rw "$MONITOR_FILE" || fail_exit "Monitor socket $MONITOR_FILE not existing or not writable"
+ test_socket_rw "$MONITOR_FILE" || fail_exit "Monitor socket $MONITOR_FILE not existing or not writable"
KVM_WAIT_SHUTDOWN=${KVM_WAIT_SHUTDOWN:-20}
@@ -578,7 +578,6 @@ function kvm_list ()
kvm_init_env `basename "${file%"-vm"}"`
if [[ -z "$1" || "$1" == "$KVM_CLUSTER_NODE" ]]; then
local VM_STATUS="Halted"
-# test_exist "$PID_FILE" && VM_STATUS=$(test_pid `cat "$PID_FILE"` && echo "Running" || echo "Error!")
test_exist "$PID_FILE" && VM_STATUS="Running"
printf "\t%-20s\t$VM_STATUS\ton ${KVM_CLUSTER_NODE:-local}\n" "$VM_NAME"
fi