diff --git a/src/entry.sh b/src/entry.sh index ae95a94..5738399 100755 --- a/src/entry.sh +++ b/src/entry.sh @@ -17,6 +17,11 @@ cd /run trap - ERR +if [[ "${CONSOLE}" == [Yy]* ]]; then + exec qemu-system-x86_64 -pidfile "${QEMU_PID}" ${ARGS:+ $ARGS} + exit $? +fi + set -m ( [[ "${DEBUG}" == [Yy1]* ]] && info "$VERS" && set -x diff --git a/src/reset.sh b/src/reset.sh index 37a05ad..a8900c3 100644 --- a/src/reset.sh +++ b/src/reset.sh @@ -12,6 +12,7 @@ trap 'error "Status $? while: ${BASH_COMMAND} (line $LINENO/$BASH_LINENO)"' ERR : ${GPU:='N'} # Enable GPU passthrough : ${DEBUG:='N'} # Enable debugging mode +: ${CONSOLE:='N'} # Start in console mode : ${ALLOCATE:='Y'} # Preallocate diskspace : ${ARGUMENTS:=''} # Extra QEMU parameters : ${CPU_CORES:='1'} # Amount of CPU cores diff --git a/src/serial.sh b/src/serial.sh index c377a1d..c2ccb24 100644 --- a/src/serial.sh +++ b/src/serial.sh @@ -48,7 +48,7 @@ sleep 0.2 while ! nc -z -w1 127.0.0.1 2210 > /dev/null 2>&1; do sleep 0.1 cnt=$((cnt + 1)) - (( cnt > 20 )) && error "Failed to connect to qemu-host.." && exit 58 + (( cnt > 50 )) && error "Failed to connect to qemu-host.." && exit 58 done cnt=0 @@ -56,7 +56,7 @@ cnt=0 while ! nc -z -w1 127.0.0.1 12345 > /dev/null 2>&1; do sleep 0.1 cnt=$((cnt + 1)) - (( cnt > 20 )) && error "Failed to connect to qemu-host.." && exit 59 + (( cnt > 50 )) && error "Failed to connect to qemu-host.." && exit 59 done # Configure serial ports