diff --git a/Dockerfile b/Dockerfile index 8a5b3dc..066fff2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM scratch -COPY --from=qemux/qemu-arm:1.10 / / +COPY --from=qemux/qemu-arm:1.11 / / ARG DEBCONF_NOWARNINGS "yes" ARG DEBIAN_FRONTEND "noninteractive" diff --git a/src/entry.sh b/src/entry.sh index 903c48c..ea54df6 100644 --- a/src/entry.sh +++ b/src/entry.sh @@ -21,13 +21,9 @@ cd /run trap - ERR -info "Booting $APP using $VERS..." +info "Booting ${APP}${BOOT_DESC} on ${CPU} using QEMU v${VERS} with kernel $(uname -r)..." [[ "$DEBUG" == [Yy1]* ]] && echo "Arguments: $ARGS" && echo -if [[ "$CONSOLE" == [Yy]* ]]; then - exec qemu-system-x86_64 ${ARGS:+ $ARGS} -fi - { qemu-system-aarch64 ${ARGS:+ $ARGS} >"$QEMU_OUT" 2>"$QEMU_LOG"; rc=$?; } || : (( rc != 0 )) && error "$(<"$QEMU_LOG")" && exit 15