X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-what.in;h=5ccf49e2e7a584ac4ead259c903026ece510fee9;hb=HEAD;hp=ad82e224af50962f1aaee861b4260b4c2fcaa71b;hpb=26b2c9c5156e85a4d7b566c22cb8f13c741e3530;p=virt-what.git

diff --git a/virt-what.in b/virt-what.in
index ad82e22..5ccf49e 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -165,7 +165,6 @@ fi
 # /proc/vz - always exists if OpenVZ kernel is running (inside and outside
 # container)
 # /proc/bc - exists on node, but not inside container.
-
 if [ -d "${root}/proc/vz" -a ! -d "${root}/proc/bc" ]; then
     echo openvz
 fi
@@ -173,12 +172,13 @@ fi
 # Check for LXC containers
 # http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface
 # Added by Marc Fournier
-
 if [ -e "${root}/proc/1/environ" ] &&
-    cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=lxc'; then
+    tr '\000' '\n' < "${root}/proc/1/environ" |
+        grep -Eiq '^container=lxc'; then
     echo lxc
 fi
 
+# Check for Illumos LX
 if [ -e "${root}/proc/1/environ" ] &&
     tr '\0' '\n' < "${root}/proc/1/environ" | grep -q '^container=zone$' &&
     [ -e "${root}/proc/version" ] &&
@@ -186,6 +186,32 @@ if [ -e "${root}/proc/1/environ" ] &&
     echo illumos-lx
 fi
 
+# Check for Docker.
+if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ] || \
+   grep -qF /docker/ "${root}/proc/self/cgroup" 2>/dev/null; then
+    echo docker
+fi
+
+# Check for OCI.
+if [ -e "${root}/proc/1/environ" ] &&
+    cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=oci'; then
+    echo oci
+fi
+
+# Check for CRI-O.
+if [ -e "${root}/proc/1/environ" ] &&
+    cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=crio'; then
+    echo crio
+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 for Linux-VServer
 if test -e "${root}/proc/self/status" \
    && cat "${root}/proc/self/status" | grep -q "VxID: [0-9]*"; then
@@ -239,7 +265,8 @@ if echo "$dmi" | grep -q 'Vendor: Parallels'; then
 fi
 
 # Check for Nutanix AHV.
-if echo "$dmi" | grep -q 'Manufacturer: Nutanix'; then
+if echo "$dmi" | grep -q 'Manufacturer: Nutanix' &&
+   echo "$dmi" | grep -q 'Product Name: AHV'; then
     echo nutanix_ahv
 fi
 
@@ -326,6 +353,19 @@ if ! "$skip_qemu_kvm"; then
     elif echo "$dmi" | grep -q 'Product Name: KVM'; then
         echo kvm
         skip_lkvm=true
+    elif echo "$dmi" | grep -q 'Manufacturer: KVM'; then
+        echo kvm
+        skip_lkvm=true
+    elif echo "$dmi" | grep -q 'Manufacturer: Amazon EC2' &&
+        echo "$dmi" | grep -q 'System is a virtual machine'; then
+        # This is for AWS Graviton (Arm) systems which don't have CPUID.
+        echo kvm
+        skip_lkvm=true
+    elif echo "$dmi" | grep -q 'Manufacturer: Alibaba Cloud' &&
+        echo "$dmi" | grep -q 'System is a virtual machine'; then
+        # This is for Alibaba Arm systems which don't have CPUID.
+        echo kvm
+        skip_lkvm=true
     elif echo "$dmi" | grep -q 'Manufacturer: QEMU'; then
         # The test for KVM above failed, so now we know we're
         # not using KVM acceleration.
@@ -372,20 +412,6 @@ if ! "$skip_lkvm"; then
     fi
 fi
 
-# Check for Docker.
-if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ] || \
-   grep -qF /docker/ "${root}/proc/self/cgroup" 2>/dev/null; then
-    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'
@@ -443,3 +469,8 @@ if echo "$dmi" | grep -Eq 'Version: [0-9]+\.[0-9]+\.amazon'; then
 elif echo "$dmi" | grep -q 'Vendor: Amazon EC2'; then
     echo aws
 fi
+
+# UpCloud
+if echo "$dmi" | grep -q 'Manufacturer: UpCloud'; then
+    echo upcloud
+fi