diff --git a/src/boot.sh b/src/boot.sh index 4e5dd8d..e22426a 100644 --- a/src/boot.sh +++ b/src/boot.sh @@ -5,6 +5,7 @@ set -Eeuo pipefail : "${BIOS:=""}" # Bios file BOOT_OPTS="" +BOOT_DESC="" SECURE=",secure=off" DIR="/usr/share/qemu" @@ -15,6 +16,7 @@ case "${BOOT_MODE,,}" in ;; secure) SECURE=",secure=on" + BOOT_DESC=" securely" ROM="AAVMF_CODE.secboot.fd" VARS="AAVMF_VARS.fd" ;; @@ -24,6 +26,7 @@ case "${BOOT_MODE,,}" in ;; windows_secure) SECURE=",secure=on" + BOOT_DESC=" securely" ROM="AAVMF_CODE.ms.fd" VARS="AAVMF_VARS.ms.fd" ;; diff --git a/src/entry.sh b/src/entry.sh index e438fdd..4ec0a65 100755 --- a/src/entry.sh +++ b/src/entry.sh @@ -17,7 +17,7 @@ cd /run trap - ERR -info "Booting image using $VERS..." +info "Booting image${BOOT_DESC} on ${CPU} using QEMU v${VERS} with kernel $(uname -r)..." [[ "$DEBUG" == [Yy1]* ]] && set -x exec qemu-system-aarch64 ${ARGS:+ $ARGS} diff --git a/src/reset.sh b/src/reset.sh index 82f604e..9f2efea 100644 --- a/src/reset.sh +++ b/src/reset.sh @@ -44,7 +44,8 @@ HOST=$(hostname -s) KERNEL=$(uname -r | cut -b 1) MINOR=$(uname -r | cut -d '.' -f2) ARCH=$(dpkg --print-architecture) -VERS=$(qemu-system-aarch64 --version | head -n 1 | cut -d '(' -f 1) +VERS=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1 | awk '{ print $NF }') +CPU=$(lscpu | grep 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/ */ /g') # Check system