|
 |
b853a2 |
From 57966df6adddbebc4f4a6b9db7680d99344b0b1c Mon Sep 17 00:00:00 2001
|
|
|
b853a2 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
b853a2 |
Date: Thu, 22 Dec 2022 10:34:03 +0000
|
|
|
b853a2 |
Subject: [PATCH] Move docker and podman tests up, add comments
|
|
|
b853a2 |
|
|
|
b853a2 |
Refactor to bring related tests closer together and make the comments
|
|
|
b853a2 |
more uniform.
|
|
|
b853a2 |
---
|
|
|
b853a2 |
virt-what.in | 31 +++++++++++++++----------------
|
|
|
b853a2 |
1 file changed, 15 insertions(+), 16 deletions(-)
|
|
|
b853a2 |
|
|
|
b853a2 |
diff --git a/virt-what.in b/virt-what.in
|
|
|
b853a2 |
index 170bc24ab..c6e4a1e00 100644
|
|
|
b853a2 |
--- a/virt-what.in
|
|
|
b853a2 |
+++ b/virt-what.in
|
|
|
b853a2 |
@@ -165,7 +165,6 @@ fi
|
|
|
b853a2 |
# /proc/vz - always exists if OpenVZ kernel is running (inside and outside
|
|
|
b853a2 |
# container)
|
|
|
b853a2 |
# /proc/bc - exists on node, but not inside container.
|
|
|
b853a2 |
-
|
|
|
b853a2 |
if [ -d "${root}/proc/vz" -a ! -d "${root}/proc/bc" ]; then
|
|
|
b853a2 |
echo openvz
|
|
|
b853a2 |
fi
|
|
|
b853a2 |
@@ -173,13 +172,13 @@ fi
|
|
|
b853a2 |
# Check for LXC containers
|
|
|
b853a2 |
# http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface
|
|
|
b853a2 |
# Added by Marc Fournier
|
|
|
b853a2 |
-
|
|
|
b853a2 |
if [ -e "${root}/proc/1/environ" ] &&
|
|
|
b853a2 |
tr '\000' '\n' < "${root}/proc/1/environ" |
|
|
|
b853a2 |
grep -Eiq '^container=lxc'; then
|
|
|
b853a2 |
echo lxc
|
|
|
b853a2 |
fi
|
|
|
b853a2 |
|
|
|
b853a2 |
+# Check for Illumos LX
|
|
|
b853a2 |
if [ -e "${root}/proc/1/environ" ] &&
|
|
|
b853a2 |
tr '\0' '\n' < "${root}/proc/1/environ" | grep -q '^container=zone$' &&
|
|
|
b853a2 |
[ -e "${root}/proc/version" ] &&
|
|
|
b853a2 |
@@ -187,6 +186,20 @@ if [ -e "${root}/proc/1/environ" ] &&
|
|
|
b853a2 |
echo illumos-lx
|
|
|
b853a2 |
fi
|
|
|
b853a2 |
|
|
|
b853a2 |
+# Check for Docker.
|
|
|
b853a2 |
+if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ] || \
|
|
|
b853a2 |
+ grep -qF /docker/ "${root}/proc/self/cgroup" 2>/dev/null; then
|
|
|
b853a2 |
+ echo docker
|
|
|
b853a2 |
+fi
|
|
|
b853a2 |
+
|
|
|
b853a2 |
+# Check for Podman.
|
|
|
b853a2 |
+if [ -e "${root}/proc/1/environ" ] &&
|
|
|
b853a2 |
+ cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=podman'; then
|
|
|
b853a2 |
+ echo podman
|
|
|
b853a2 |
+elif grep -qF /libpod- "${root}/proc/self/cgroup" 2>/dev/null; then
|
|
|
b853a2 |
+ echo podman
|
|
|
b853a2 |
+fi
|
|
|
b853a2 |
+
|
|
|
b853a2 |
# Check for Linux-VServer
|
|
|
b853a2 |
if test -e "${root}/proc/self/status" \
|
|
|
b853a2 |
&& cat "${root}/proc/self/status" | grep -q "VxID: [0-9]*"; then
|
|
|
b853a2 |
@@ -381,20 +394,6 @@ if ! "$skip_lkvm"; then
|
|
|
b853a2 |
fi
|
|
|
b853a2 |
fi
|
|
|
b853a2 |
|
|
|
b853a2 |
-# Check for Docker.
|
|
|
b853a2 |
-if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ] || \
|
|
|
b853a2 |
- grep -qF /docker/ "${root}/proc/self/cgroup" 2>/dev/null; then
|
|
|
b853a2 |
- echo docker
|
|
|
b853a2 |
-fi
|
|
|
b853a2 |
-
|
|
|
b853a2 |
-# Check for Podman.
|
|
|
b853a2 |
-if [ -e "${root}/proc/1/environ" ] &&
|
|
|
b853a2 |
- cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=podman'; then
|
|
|
b853a2 |
- echo podman
|
|
|
b853a2 |
-elif grep -qF /libpod- "${root}/proc/self/cgroup" 2>/dev/null; then
|
|
|
b853a2 |
- echo podman
|
|
|
b853a2 |
-fi
|
|
|
b853a2 |
-
|
|
|
b853a2 |
# Check ppc64 lpar, kvm or powerkvm
|
|
|
b853a2 |
|
|
|
b853a2 |
# example /proc/cpuinfo line indicating 'not baremetal'
|
|
|
b853a2 |
--
|
|
|
b853a2 |
2.31.1
|
|
|
b853a2 |
|