alibaba-cloud: Make the test more robust

[virt-what.git] / virt-what.in

diff --git a/virt-what.in b/virt-what.in
index 850760e..ad82e22 100644 (file)
--- 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
@@ -116,7 +116,7 @@ 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
+    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"
@@ -179,6 +179,13 @@ if [ -e "${root}/proc/1/environ" ] &&
     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
@@ -232,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.