Skip to content

Commit

Permalink
feat: Display system info on boot (#696)
Browse files Browse the repository at this point in the history
  • Loading branch information
kroese authored Apr 22, 2024
1 parent 66ac2d2 commit ac78cc7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/entry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cd /run

trap - ERR

info "Booting $APP using $VERS..."
info "Booting ${APP} on a ${HOST_CPU} using QEMU v${VERS} with kernel $(uname -r)..."
[[ "$DEBUG" == [Yy1]* ]] && echo "Arguments: $ARGS" && echo

if [[ "$CONSOLE" == [Yy]* ]]; then
Expand Down
5 changes: 3 additions & 2 deletions src/proc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ if [[ "$KVM" != [Nn]* ]]; then
if ! sh -c 'echo -n > /dev/kvm' &> /dev/null; then
KVM_ERR="(no write access)"
else
if ! grep -q -e vmx -e svm /proc/cpuinfo; then
flags=$(sed -ne '/^flags/s/^.*: //p' /proc/cpuinfo)
if ! grep -qw "vmx\|svm" <<< "$flags"; then
KVM_ERR="(vmx/svm disabled)"
fi
fi
Expand All @@ -41,7 +42,7 @@ if [[ "$KVM" != [Nn]* ]]; then
CPU_FEATURES="kvm=on,l3-cache=on"
KVM_OPTS=",accel=kvm -enable-kvm -global kvm-pit.lost_tick_policy=discard"

if ! grep -qE '^flags.* (sse4_2)' /proc/cpuinfo; then
if ! grep -qw "sse4_2" <<< "$flags"; then
info "Your CPU does not have the SSE4 instruction set that Virtual DSM requires, it will be emulated..."
[ -z "$CPU_MODEL" ] && CPU_MODEL="$DEF_MODEL"
CPU_FEATURES="$CPU_FEATURES,+ssse3,+sse4.1,+sse4.2"
Expand Down
2 changes: 1 addition & 1 deletion src/reset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ 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 }')

# Check system

Expand Down

0 comments on commit ac78cc7

Please sign in to comment.