Unverified Commit 536e95d1 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Display system info in log (#470)

parent 72d4ef21

src/boot.sh

+5 −0
Original line number Diff line number Diff line
@@ -5,16 +5,19 @@ set -Eeuo pipefail 
: "${TPM:="N"}"         # Disable TPM

: "${BOOT_MODE:="legacy"}"  # Boot mode



BOOT_DESC=""

BOOT_OPTS=""

SECURE=",smm=off"



case "${BOOT_MODE,,}" in

  uefi)

    BOOT_DESC=" (UEFI)"

    ROM="OVMF_CODE_4M.fd"

    VARS="OVMF_VARS_4M.fd"

    ;;

  secure)

    SECURE=",smm=on"

    BOOT_DESC=" securely"

    ROM="OVMF_CODE_4M.secboot.fd"

    VARS="OVMF_VARS_4M.secboot.fd"

    ;;
@@ -25,10 +28,12 @@ case "${BOOT_MODE,,}" in 
  windows_secure)

    TPM="Y"

    SECURE=",smm=on"

    BOOT_DESC=" securely"

    ROM="OVMF_CODE_4M.ms.fd"

    VARS="OVMF_VARS_4M.ms.fd"

    ;;

  windows_legacy)

    BOOT_DESC=" (legacy)"

    USB="usb-ehci,id=ehci"

    ;;

  legacy)

src/entry.sh

+1 −1
Original line number Diff line number Diff line
@@ -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-x86_64 ${ARGS:+ $ARGS}

src/reset.sh

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ HOST=$(hostname -s) 
KERNEL=$(uname -r | cut -b 1)

MINOR=$(uname -r | cut -d '.' -f2)

ARCH=$(dpkg --print-architecture)

VERS=$(qemu-system-x86_64 --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