diff --git a/src/entry.sh b/src/entry.sh index 0dcd45d..e805110 100755 --- a/src/entry.sh +++ b/src/entry.sh @@ -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 diff --git a/src/proc.sh b/src/proc.sh index e4c0d90..def39fd 100644 --- a/src/proc.sh +++ b/src/proc.sh @@ -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 @@ -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" diff --git a/src/reset.sh b/src/reset.sh index f7b8639..4c4f082 100644 --- a/src/reset.sh +++ b/src/reset.sh @@ -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