X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-what.in;h=6330fd094a53b31ddd86363f06075de23efd118e;hb=6831ccb71a7b19c6e5cb970026cbffff39928e2b;hp=a61ce913210b6df81e00ce5cde71a08679a0df6f;hpb=71ef45e9543278e9920e449b71e0da269662ebc9;p=virt-what.git

diff --git a/virt-what.in b/virt-what.in
index a61ce91..6330fd0 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -264,6 +264,10 @@ elif [ "$arch" = "arm" ] || [ "$arch" = "aarch64" ]; then
         echo xen
         skip_qemu_kvm=true
         skip_lkvm=true
+    elif [ -d "${root}/proc/device-tree/hypervisor" ] &&
+        grep -q "vmware" "${root}/proc/device-tree/hypervisor/compatible"; then
+        echo vmware
+        skip_lkvm=true
     fi
 elif [ "$arch" = "ia64" ]; then
     if [ -d "${root}/sys/bus/xen" -a ! -d "${root}/sys/bus/xen-backend" ]; then
@@ -345,7 +349,8 @@ if ! "$skip_lkvm"; then
 fi
 
 # Check for Docker.
-if [ -f "${root}/.dockerinit" ]; then
+if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ] || \
+   grep -qF /docker/ "${root}/proc/self/cgroup" 2>/dev/null; then
     echo docker
 fi