[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0e457b13eaf61b2830919e3745df3956e2042640

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2193 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  0e457b13eaf61b2830919e3745df3956e2042640 (commit)
      from  087e3023812fec5dc4d4d85724166e64c24ab4cc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0e457b13eaf61b2830919e3745df3956e2042640
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Aug 21 11:51:10 2020 +0200

    smt: Fix check to detect if a system is running virtually
    
    /sys/hypervisor exists when a host has loaded the kvm modules.
    
    Fixes: #12472
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/system/functions | 5 +++++
 src/initscripts/system/smt       | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions
index 30119918c..234b798cf 100644
--- a/src/initscripts/system/functions
+++ b/src/initscripts/system/functions
@@ -784,6 +784,11 @@ umount_ramdisk() {
 	rm -rf "${path_tmpfs}"
 }
 
+# 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
 
 		# Do not disable SMT inside virtual machines
-		if [ -d "/sys/hypervisor" ]; then
+		if running_on_hypervisor; then
 			exit 0
 		fi
 


hooks/post-receive
--
IPFire 2.x development tree