diff options
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 |