From c335078aaca5accce3c7502eeeb599ac7a58c931 Mon Sep 17 00:00:00 2001 From: Kroese Date: Sat, 16 Dec 2023 01:00:42 +0100 Subject: [PATCH] feat: Display emulated CPU --- src/serial.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/serial.sh b/src/serial.sh index 924497c..ea4ec44 100644 --- a/src/serial.sh +++ b/src/serial.sh @@ -10,17 +10,22 @@ set -Eeuo pipefail : ${HOST_MODEL:=''} : ${GUEST_SERIAL:=''} -if [ -z "$HOST_CPU" ]; then +if [ -z "$HOST_CPU" ] && [ "$CPU_MODEL" == "host" ]; then HOST_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') fi if [ -n "$HOST_CPU" ]; then - HOST_CPU="$HOST_CPU,," + HOST_CPU="${HOST_CPU%%,*},," else - if [ "$ARCH" == "amd64" ]; then - HOST_CPU="QEMU, Virtual CPU, X86_64" + if [ "$CPU_MODEL" == "host" ]; then + HOST_CPU="QEMU" else - HOST_CPU="QEMU, Virtual CPU, $ARCH" + HOST_CPU="${CPU_MODEL%%,*}" + fi + if [ "$ARCH" == "amd64" ]; then + HOST_CPU="${HOST_CPU%%,*}, Virtual CPU, X86_64" + else + HOST_CPU="${HOST_CPU%%,*}, Virtual CPU, $ARCH" fi fi