opensourcemirror
/
netdata
mirror of https://github.com/netdata/netdata.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Corrected virtualization detection in system-info.sh. (#9425) 

This causes failure to detect virtualization to be reported as no
virtualization instead of unknown virtulization.
This commit is contained in:
Austin S. Hemmelgarn 2020-06-29 14:21:09 -04:00 committed by GitHub
parent 986b401133
commit 5d21a9d542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daemon/system-info.sh
View File

@ -23,13 +23,11 @@ if [ -z "${VIRTUALIZATION}" ]; then
if grep -q "^flags.*hypervisor" /proc/cpuinfo 2>/dev/null; then
VIRTUALIZATION="hypervisor"
VIRT_DETECTION="/proc/cpuinfo"
elif [ -n "$(command -v dmidecode)" ]; then
# Virtualization detection from https://unix.stackexchange.com/questions/89714/easy-way-to-determine-virtualization-technology
# This only works as root
if dmidecode -s system-product-name 2>/dev/null | grep -q "VMware\|Virtual\|KVM\|Bochs"; then
VIRTUALIZATION="$(dmidecode -s system-product-name)"
VIRT_DETECTION="dmidecode"
fi
elif [ -n "$(command -v dmidecode)" ] && dmidecode -s system-product-name 2>/dev/null | grep -q "VMware\|Virtual\|KVM\|Bochs"; then
VIRTUALIZATION="$(dmidecode -s system-product-name)"
VIRT_DETECTION="dmidecode"
else
VIRTUALIZATION="none"
fi
fi
else