1
0
mirror of https://github.com/rancher/os.git synced 2025-08-07 01:34:03 +00:00

Merge pull request #1867 from rancher/revert-1857-stop-ctrl-c-in-qemu-exiting-vm

Revert "Prevent ctrl-c in qemu from exiting vm - use ctrl-] instead"
This commit is contained in:
Sven Dowideit 2017-05-19 12:42:47 +10:00 committed by GitHub
commit 4ae80319dd

View File

@ -266,11 +266,6 @@ if [ "$QEMU" == "1" ]; then
else else
INSTALLED_ARGS="-kernel ${KERNEL} -initrd ${INITRD}" INSTALLED_ARGS="-kernel ${KERNEL} -initrd ${INITRD}"
fi fi
# don't quit qemu using ctrl-c
stty intr ^]
stty susp ^]
stty quit ^]
set -x set -x
exec qemu-system-${QEMUARCH} \ exec qemu-system-${QEMUARCH} \
${DISPLAY_OPTS} \ ${DISPLAY_OPTS} \
@ -300,10 +295,6 @@ elif [ "$BOOT_ISO" == "1" ] ||
echo "----- $ISO_OPTS" echo "----- $ISO_OPTS"
fi fi
set -x set -x
# don't quit qemu using ctrl-c
stty intr ^]
stty susp ^]
stty quit ^]
exec qemu-system-${QEMUARCH} \ exec qemu-system-${QEMUARCH} \
${DISPLAY_OPTS} \ ${DISPLAY_OPTS} \
${CLOUD_CONFIG_DISK} \ ${CLOUD_CONFIG_DISK} \