diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2012-11-22 13:19:13 +0100 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2012-11-22 13:22:25 +0100 |
| commit | b77ef6e8ec63981eb2f9afeb9b41476a68b92ea1 (patch) | |
| tree | 5c41f94d18795b8b0c59f2cfdad5d2979215eb14 | |
| parent | 23807de6c7b3296eac292a5ec5d9d10beaf67794 (diff) | |
Wait-if-inside-screen: Changed variable used to a custom one to avoid conflict if already inside a screen
| -rw-r--r-- | kvm-wrapper.conf.default | 4 | ||||
| -rwxr-xr-x | kvm-wrapper.sh | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kvm-wrapper.conf.default b/kvm-wrapper.conf.default index e5ae522..e5bca37 100644 --- a/kvm-wrapper.conf.default +++ b/kvm-wrapper.conf.default @@ -27,8 +27,8 @@ SCREEN_ATTACH="screen -RR" SCREEN_NAME_PREFIX="" SCREEN_EXTRA_OPTS="" #Uncomment to use dtach: -#SCREEN_START_ATTACHED="STY=dtach dtach -A" -#SCREEN_START_DETACHED="STY=dtach dtach -n" +#SCREEN_START_ATTACHED="dtach -A" +#SCREEN_START_DETACHED="dtach -n" #SCREEN_ATTACH="dtach -a" #SCREEN_NAME_PREFIX="$RUN_DIR/" #SCREEN_EXTRA_OPTS="-z -r winch" # change escape key: "-e ^]" diff --git a/kvm-wrapper.sh b/kvm-wrapper.sh index 4f09aa2..a894109 100755 --- a/kvm-wrapper.sh +++ b/kvm-wrapper.sh @@ -20,7 +20,7 @@ function fail_exit () { echo -ne '\n' echo -e "$1" - [[ -n "$STY" ]] && ( + [[ -n "$KVM_SCREEN" ]] && ( local USE_PID_FILE="" test_exist "$PID_FILE" || USE_PID_FILE="true" [[ -n "$USE_PID_FILE" ]] && echo "error" > "$PID_FILE" @@ -611,12 +611,12 @@ function kvm_run_disk () function kvm_start_screen () { check_create_dir "$RUN_DIR" - eval $SCREEN_START_ATTACHED "$SCREEN_SESSION_NAME" $SCREEN_EXTRA_OPTS "$SCRIPT_PATH" start-here "$VM_NAME" + eval KVM_SCREEN="yes" $SCREEN_START_ATTACHED "$SCREEN_SESSION_NAME" $SCREEN_EXTRA_OPTS "$SCRIPT_PATH" start-here "$VM_NAME" } function kvm_start_screen_detached () { - eval $SCREEN_START_DETACHED "$SCREEN_SESSION_NAME" $SCREEN_EXTRA_OPTS "$SCRIPT_PATH" start-here "$VM_NAME" + eval KVM_SCREEN="yes" $SCREEN_START_DETACHED "$SCREEN_SESSION_NAME" $SCREEN_EXTRA_OPTS "$SCRIPT_PATH" start-here "$VM_NAME" } function kvm_attach_screen () @@ -817,7 +817,7 @@ function kvm_receive_migrate_vm () { local PORT="$2" - $SCREEN_START_DETACHED "$SCREEN_SESSION_NAME" $SCREEN_EXTRA_OPTS "$SCRIPT_PATH" receive-migrate-here "$VM_NAME" "$PORT" + eval KVM_SCREEN="yes" $SCREEN_START_DETACHED "$SCREEN_SESSION_NAME" $SCREEN_EXTRA_OPTS "$SCRIPT_PATH" receive-migrate-here "$VM_NAME" "$PORT" # Wait for the receiving qemu is ready. #while ! test_exist $RUN_DIR/migrate-$VM_NAME.sock; do @@ -1119,7 +1119,7 @@ case "$1" in load-state) if [[ $# -eq 2 ]]; then check_create_dir "$RUN_DIR" - $SCREEN_START_ATTACHED "$SCREEN_SESSION_NAME" $SCREEN_EXTRA_OPTS "$SCRIPT_PATH" load-state-here "$VM_NAME" + eval KVM_SCREEN="yes" $SCREEN_START_ATTACHED "$SCREEN_SESSION_NAME" $SCREEN_EXTRA_OPTS "$SCRIPT_PATH" load-state-here "$VM_NAME" else print_help; fi ;; load-state-here) |