diff options
author | Trevor Woerner <twoerner@gmail.com> | 2012-12-21 08:04:53 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-26 11:34:07 +0000 |
commit | ae84362fcce244d81b2c14773b218db0c2ac02f7 (patch) | |
tree | 0dc65c65c233fc48928e855792dd2abfab2069f1 /scripts/runqemu-internal | |
parent | 4491154b213ff342303298a869cfb26ea20e7b14 (diff) | |
download | poky-ae84362fcce244d81b2c14773b218db0c2ac02f7.tar.gz |
runqemu: change terminal's INTR key in 'serial' mode
If you are using an image in '-serial stdio' mode, temporarily change the
terminal's interrupt character to 'Ctrl-]' for the duration of the image
run. In this way, hitting 'Ctrl-C' for something running in the image
doesn't accidentally abort the entire qemu session.
(From OE-Core rev: 642cfaac0cb515008cfc91aafe04ab1db7a51581)
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-x | scripts/runqemu-internal | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 7fbe0a0976..a11220dd50 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal | |||
@@ -444,6 +444,7 @@ if [ "$MACHINE" = "qemush4" ]; then | |||
444 | #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" | 444 | #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" |
445 | KERNCMDLINE="root=/dev/hda rw console=ttySC1 noiotrap earlyprintk=sh-sci.1 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" | 445 | KERNCMDLINE="root=/dev/hda rw console=ttySC1 noiotrap earlyprintk=sh-sci.1 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" |
446 | QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS -monitor null -serial vc -serial stdio" | 446 | QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS -monitor null -serial vc -serial stdio" |
447 | SERIALSTDIO="1" | ||
447 | fi | 448 | fi |
448 | if [ "$FSTYPE" = "nfs" ]; then | 449 | if [ "$FSTYPE" = "nfs" ]; then |
449 | if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then | 450 | if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then |
@@ -453,6 +454,7 @@ if [ "$MACHINE" = "qemush4" ]; then | |||
453 | fi | 454 | fi |
454 | KERNCMDLINE="root=/dev/nfs console=ttySC1 noiotrap earlyprintk=sh-sci.1 console=tty nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" | 455 | KERNCMDLINE="root=/dev/nfs console=ttySC1 noiotrap earlyprintk=sh-sci.1 console=tty nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" |
455 | QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS -monitor null -serial vc -serial stdio" | 456 | QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS -monitor null -serial vc -serial stdio" |
457 | SERIALSTDIO="1" | ||
456 | fi | 458 | fi |
457 | fi | 459 | fi |
458 | 460 | ||
@@ -565,6 +567,11 @@ then | |||
565 | fi | 567 | fi |
566 | fi | 568 | fi |
567 | 569 | ||
570 | if [ "x$SERIALSTDIO" = "x1" ]; then | ||
571 | echo "Interrupt character is '^]'" | ||
572 | stty intr ^] | ||
573 | fi | ||
574 | |||
568 | echo "Running $QEMU..." | 575 | echo "Running $QEMU..." |
569 | # -no-reboot is a mandatory option - see bug #100 | 576 | # -no-reboot is a mandatory option - see bug #100 |
570 | if [ "$FSTYPE" = "vmdk" ]; then | 577 | if [ "$FSTYPE" = "vmdk" ]; then |