From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] smt: Fix check to detect if a system is running virtually Date: Fri, 21 Aug 2020 11:51:10 +0200 Message-ID: <20200821095110.9090-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2540413883906415687==" List-Id: --===============2540413883906415687== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable /sys/hypervisor exists when a host has loaded the kvm modules. Fixes: #12472 Signed-off-by: Michael Tremer --- src/initscripts/system/functions | 5 +++++ src/initscripts/system/smt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/initscripts/system/functions b/src/initscripts/system/functi= ons index 30119918c..234b798cf 100644 --- a/src/initscripts/system/functions +++ b/src/initscripts/system/functions @@ -784,6 +784,11 @@ umount_ramdisk() { rm -rf "${path_tmpfs}" } =20 +# Returns true when this system running in a virtual environment +running_on_hypervisor() { + grep -qE "^flags\s+:.*hypervisor" /proc/cpuinfo +} + # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/identify_ec2_instances= .html running_on_ec2() { local uuid diff --git a/src/initscripts/system/smt b/src/initscripts/system/smt index bfa7d57b3..274ec4bba 100644 --- a/src/initscripts/system/smt +++ b/src/initscripts/system/smt @@ -21,7 +21,7 @@ case "${1}" in fi 2>/dev/null =20 # Do not disable SMT inside virtual machines - if [ -d "/sys/hypervisor" ]; then + if running_on_hypervisor; then exit 0 fi =20 --=20 2.12.2 --===============2540413883906415687==--