X-Git-Url: http://git.annexia.org/?p=virt-what.git;a=blobdiff_plain;f=virt-what.in;h=850760ef4dd448b43b74c212c00d932f01bb3232;hp=d43916beea13e6b0821b05bc9afc79cc071f667f;hb=b64df398779db07d008781c96685878795bcfd67;hpb=57f0c3cc6a7e631f644d67f05b002c6004bb6601

diff --git a/virt-what.in b/virt-what.in
index d43916b..850760e 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -113,6 +113,16 @@ dmi=$(LANG=C dmidecode 2>&1)
 
 arch=$(uname -m | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/')
 
+# Check for Alibaba Cloud
+if echo "$dmi" | grep -q 'Manufacturer: Alibaba'; then
+    # Check for Alibaba Cloud ECS Bare Metal (EBM) Instance
+    if ( { echo -e "GET /latest/meta-datainstance/instance-type HTTP/1.0\r\nHost: 100.100.100.200\r\n\r" >&3; grep -sq 'ebm' <&3 ; } 3<> /dev/tcp/100.100.100.200/80 ) 2>/dev/null ; then
+        echo "alibaba_cloud-ebm"
+    else
+        echo "alibaba_cloud"
+    fi
+fi
+
 # Check for VMware.
 # cpuid check added by Chetan Loke.
 
@@ -165,7 +175,7 @@ fi
 # Added by Marc Fournier
 
 if [ -e "${root}/proc/1/environ" ] &&
-    cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container='; then
+    cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=lxc'; then
     echo lxc
 fi
 
@@ -237,6 +247,16 @@ if echo "$dmi" | grep -q 'Product Name: RHEV Hypervisor'; then
     echo rhev
 fi
 
+# Google Cloud
+if echo "$dmi" | grep -q 'Product Name: Google Compute Engine'; then
+    echo google_cloud
+fi
+
+# Red Hat's hypervisor.
+if echo "$dmi" | grep -q 'Manufacturer: Red Hat'; then
+    echo redhat
+fi
+
 # Check for Xen.
 
 if [ "$cpuid" = "XenVMMXenVMM" ] &&
@@ -264,6 +284,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
@@ -350,6 +374,14 @@ if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ] || \
     echo docker
 fi
 
+# Check for Podman.
+if [ -e "${root}/proc/1/environ" ] &&
+    cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=podman'; then
+    echo podman
+elif grep -qF /libpod- "${root}/proc/self/cgroup" 2>/dev/null; then
+    echo podman
+fi
+
 # Check ppc64 lpar, kvm or powerkvm
 
 # example /proc/cpuinfo line indicating 'not baremetal'
@@ -401,7 +433,7 @@ fi
 
 # Check for AWS.
 # AWS on Xen.
-if echo "$dmi" | grep -q 'Version: [0-9]\.[0-9]\.amazon'; then
+if echo "$dmi" | grep -Eq 'Version: [0-9]+\.[0-9]+\.amazon'; then
     echo aws
 # AWS on baremetal or KVM.
 elif echo "$dmi" | grep -q 'Vendor: Amazon EC2'; then