diff options
author | Dominique Martinet <asmadeus@codewreck.org> | 2012-11-17 10:38:12 +0100 |
---|---|---|
committer | Dominique Martinet <asmadeus@codewreck.org> | 2012-11-20 13:39:26 +0100 |
commit | 796bf27d9a3677a547d41ae1f34e126580f4597a (patch) | |
tree | 2911be076b281be6968424f7eff1cd4bd7c96f61 | |
parent | a8d962bad074b703745272b8297de29a767ffef5 (diff) |
Clearer choice between screen and dtach. screen now attachs first available if multiple listed
-rw-r--r-- | kvm-wrapper.conf.default | 16 | ||||
-rwxr-xr-x | kvm-wrapper.sh | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/kvm-wrapper.conf.default b/kvm-wrapper.conf.default index 7c3c72f..e5ae522 100644 --- a/kvm-wrapper.conf.default +++ b/kvm-wrapper.conf.default @@ -21,11 +21,17 @@ KVM_BIN="/usr/bin/qemu-system-x86_64" KVM_IMG_BIN="/usr/bin/qemu-img" KVM_NBD_BIN="/usr/bin/qemu-nbd" LVM_LVCREATE_BIN="/sbin/lvcreate" -SCREEN_START_ATTACHED="screen -m -S" #"dtach -A" -SCREEN_START_DETACHED="screen -d -m -S" #"dtach -n" -SCREEN_ATTACH="screen -r" #"dtach -a" -SCREEN_NAME_PREFIX="" #"$RUN_DIR/" -SCREEN_EXTRA_OPTS="" #"-z -r winch" (+"-e ^]") +SCREEN_START_ATTACHED="screen -m -S" +SCREEN_START_DETACHED="screen -d -m -S" +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_ATTACH="dtach -a" +#SCREEN_NAME_PREFIX="$RUN_DIR/" +#SCREEN_EXTRA_OPTS="-z -r winch" # change escape key: "-e ^]" STARTUP_LIST="$ROOTDIR/startup/startup-list" diff --git a/kvm-wrapper.sh b/kvm-wrapper.sh index 29eee42..9515060 100755 --- a/kvm-wrapper.sh +++ b/kvm-wrapper.sh @@ -596,12 +596,12 @@ function kvm_run_disk () function kvm_start_screen () { check_create_dir "$RUN_DIR" - $SCREEN_START_ATTACHED "$SCREEN_SESSION_NAME" $SCREEN_EXTRA_OPTS "$SCRIPT_PATH" start-here "$VM_NAME" + eval $SCREEN_START_ATTACHED "$SCREEN_SESSION_NAME" $SCREEN_EXTRA_OPTS "$SCRIPT_PATH" start-here "$VM_NAME" } function kvm_start_screen_detached () { - $SCREEN_START_DETACHED "$SCREEN_SESSION_NAME" $SCREEN_EXTRA_OPTS "$SCRIPT_PATH" start-here "$VM_NAME" + eval $SCREEN_START_DETACHED "$SCREEN_SESSION_NAME" $SCREEN_EXTRA_OPTS "$SCRIPT_PATH" start-here "$VM_NAME" } function kvm_attach_screen () |