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

diff --git a/virt-what.in b/virt-what.in
index 9eafa05..ad82e22 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -1,6 +1,6 @@
 #!/bin/sh -
 # @configure_input@
-# Copyright (C) 2008-2019 Red Hat Inc.
+# Copyright (C) 2008-2022 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -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 [ "x$root" = "x" ] && ( { 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.
 
@@ -132,7 +142,8 @@ fi
 # The negative check for cpuid is to distinguish this from Hyper-V
 # which also has the same manufacturer string in the SM-BIOS data.
 if [ "$cpuid" != "Microsoft Hv" ] &&
-    echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation'; then
+    echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation' &&
+    echo "$dmi" | grep -q 'Product Name: Virtual Machine'; then
     echo virtualpc
 fi
 
@@ -164,10 +175,17 @@ 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
 
+if [ -e "${root}/proc/1/environ" ] &&
+    tr '\0' '\n' < "${root}/proc/1/environ" | grep -q '^container=zone$' &&
+    [ -e "${root}/proc/version" ] &&
+    grep -q 'BrandZ virtual linux' < "${root}/proc/version"; then
+    echo illumos-lx
+fi
+
 # Check for Linux-VServer
 if test -e "${root}/proc/self/status" \
    && cat "${root}/proc/self/status" | grep -q "VxID: [0-9]*"; then
@@ -221,11 +239,8 @@ if echo "$dmi" | grep -q 'Vendor: Parallels'; then
 fi
 
 # Check for Nutanix AHV.
-# This is sufficiently different from KVM and has Viridian extensions,
-# so skip the KVM test.
 if echo "$dmi" | grep -q 'Manufacturer: Nutanix'; then
     echo nutanix_ahv
-    skip_qemu_kvm=true
 fi
 
 # Check for oVirt/RHEV.
@@ -236,6 +251,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" ] &&
@@ -263,6 +288,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
@@ -344,10 +373,19 @@ 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
 
+# 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'
@@ -399,7 +437,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