From 4244f0f639665f1e070074164017a65b6d869a08 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 10 2023 08:10:06 +0000 Subject: import virt-what-1.25-2.el8 --- diff --git a/SOURCES/0001-Rearrange-lxc-test-to-avoid-use-of-cat.patch b/SOURCES/0001-Rearrange-lxc-test-to-avoid-use-of-cat.patch new file mode 100644 index 0000000..4446201 --- /dev/null +++ b/SOURCES/0001-Rearrange-lxc-test-to-avoid-use-of-cat.patch @@ -0,0 +1,27 @@ +From a29d4a5632ff9f60f939e4f0f36ce97ed43c5650 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 22 Dec 2022 10:31:47 +0000 +Subject: [PATCH] Rearrange lxc test to avoid use of cat + +Thanks: Elias Probst +--- + virt-what.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/virt-what.in b/virt-what.in +index d090898e5..170bc24ab 100644 +--- a/virt-what.in ++++ b/virt-what.in +@@ -175,7 +175,8 @@ fi + # 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 + +-- +2.31.1 + diff --git a/SOURCES/0002-Move-docker-and-podman-tests-up-add-comments.patch b/SOURCES/0002-Move-docker-and-podman-tests-up-add-comments.patch new file mode 100644 index 0000000..10b115c --- /dev/null +++ b/SOURCES/0002-Move-docker-and-podman-tests-up-add-comments.patch @@ -0,0 +1,83 @@ +From 57966df6adddbebc4f4a6b9db7680d99344b0b1c Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 22 Dec 2022 10:34:03 +0000 +Subject: [PATCH] Move docker and podman tests up, add comments + +Refactor to bring related tests closer together and make the comments +more uniform. +--- + virt-what.in | 31 +++++++++++++++---------------- + 1 file changed, 15 insertions(+), 16 deletions(-) + +diff --git a/virt-what.in b/virt-what.in +index 170bc24ab..c6e4a1e00 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,13 +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" ] && + 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" ] && +@@ -187,6 +186,20 @@ 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 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 +@@ -381,20 +394,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' +-- +2.31.1 + diff --git a/SOURCES/0003-podman-Fix-location-of-test-file-proc-1-environ.patch b/SOURCES/0003-podman-Fix-location-of-test-file-proc-1-environ.patch new file mode 100644 index 0000000..2ddd094 --- /dev/null +++ b/SOURCES/0003-podman-Fix-location-of-test-file-proc-1-environ.patch @@ -0,0 +1,36 @@ +From 1cbcbb801c86f8f791ecd930c4ac311f034e3e1a Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 5 Jan 2023 12:48:55 +0000 +Subject: [PATCH] podman: Fix location of test file /proc/1/environ + +Since it was at the wrong location, the file was not even used by the +test. + +Fixes: commit 1df728aa4b ("Add podman support") +--- + tests/podman/Makefile.am | 2 +- + tests/podman/{ => proc}/1/environ | Bin + 2 files changed, 1 insertion(+), 1 deletion(-) + rename tests/podman/{ => proc}/1/environ (100%) + +diff --git a/tests/podman/Makefile.am b/tests/podman/Makefile.am +index 2962f3237..1745ef6c6 100644 +--- a/tests/podman/Makefile.am ++++ b/tests/podman/Makefile.am +@@ -20,8 +20,8 @@ CLEANFILES = *~ + TESTS = test.sh + + EXTRA_DIST = \ +- 1/environ \ + test.sh \ ++ proc/1/environ \ + proc/cpuinfo \ + proc/self/cgroup \ + proc/self/status \ +diff --git a/tests/podman/1/environ b/tests/podman/proc/1/environ +similarity index 100% +rename from tests/podman/1/environ +rename to tests/podman/proc/1/environ +-- +2.31.1 + diff --git a/SOURCES/0004-Detect-OCI-containers.patch b/SOURCES/0004-Detect-OCI-containers.patch new file mode 100644 index 0000000..f8e9a57 --- /dev/null +++ b/SOURCES/0004-Detect-OCI-containers.patch @@ -0,0 +1,888 @@ +From 54c2ad4a764658ec8a9aadc52c749eabf1de73a0 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 5 Jan 2023 12:34:02 +0000 +Subject: [PATCH] Detect OCI containers + +Podman using OCI containers sets container=oci in PID 1's environment. +Detect that and print "oci" fact. + +This patch was originally contributed by Alessandro Valentini. I +modified it and added tests and documentation. + +Reported-by: Alessandro Valentini +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2155233 +--- + configure.ac | 2 + + tests/oci/Makefile.am | 28 ++ + tests/oci/proc/1/environ | Bin 0 -> 124 bytes + tests/oci/proc/cpuinfo | 671 ++++++++++++++++++++++++++ + tests/oci/sbin/dmidecode | 7 + + tests/oci/sbin/uname | 2 + + tests/oci/sbin/virt-what-cpuid-helper | 2 + + tests/oci/test.sh | 32 ++ + virt-what.in | 6 + + virt-what.pod | 8 +- + 10 files changed, 757 insertions(+), 1 deletion(-) + create mode 100644 tests/oci/Makefile.am + create mode 100644 tests/oci/proc/1/environ + create mode 100644 tests/oci/proc/cpuinfo + create mode 100755 tests/oci/sbin/dmidecode + create mode 100755 tests/oci/sbin/uname + create mode 100755 tests/oci/sbin/virt-what-cpuid-helper + create mode 100755 tests/oci/test.sh + +diff --git a/configure.ac b/configure.ac +index 8f808a38b..a80a4b6f0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,6 +56,7 @@ tests="\ + lx86 \ + lxc \ + nutanix-ahv \ ++ oci \ + parallels-desktop \ + podman \ + ppc64-baremetal \ +@@ -104,6 +105,7 @@ AC_CONFIG_FILES([Makefile + tests/lx86/Makefile + tests/lxc/Makefile + tests/nutanix-ahv/Makefile ++ tests/oci/Makefile + tests/parallels-desktop/Makefile + tests/podman/Makefile + tests/ppc64-baremetal/Makefile +diff --git a/tests/oci/Makefile.am b/tests/oci/Makefile.am +new file mode 100644 +index 000000000..b2f6f2469 +--- /dev/null ++++ b/tests/oci/Makefile.am +@@ -0,0 +1,28 @@ ++# Makefile for virt-what ++# Copyright (C) 2008-2023 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 ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++CLEANFILES = *~ ++ ++TESTS = test.sh ++ ++EXTRA_DIST = \ ++ test.sh \ ++ proc/1/environ \ ++ proc/cpuinfo \ ++ sbin/dmidecode \ ++ sbin/uname \ ++ sbin/virt-what-cpuid-helper +diff --git a/tests/oci/proc/1/environ b/tests/oci/proc/1/environ +new file mode 100644 +index 0000000000000000000000000000000000000000..03d40a45377eaeccef15532734d2f5b7fd42234e +GIT binary patch +literal 124 +zcmWG=4DqnlFD)+8&&f|t%+W7S%FMGu;={QJ39t}^3uH2cxCZ&!R+OX` ++ ++The guest is running in an OCI container. ++ ++Status: contributed by Alessandro Valentini, confirmed by RWMJ ++ + =item B + + The guest appears to be running inside an OpenVZ or Virtuozzo +@@ -226,7 +232,7 @@ Status: contributed by Justin Clift + + =item B + +-This is a Podman container. ++This is a Podman container. (See also C above.) + + Status: contributed by Jordan Webb + +-- +2.31.1 + diff --git a/SOURCES/copy-patches.sh b/SOURCES/copy-patches.sh index f9f4479..25823fe 100755 --- a/SOURCES/copy-patches.sh +++ b/SOURCES/copy-patches.sh @@ -8,7 +8,7 @@ set -e # ./copy-patches.sh project=virt-what -rhel_version=8.7 +rhel_version=8.8 # Check we're in the right directory. if [ ! -f $project.spec ]; then diff --git a/SPECS/virt-what.spec b/SPECS/virt-what.spec index 7ec0c70..26b4ad5 100644 --- a/SPECS/virt-what.spec +++ b/SPECS/virt-what.spec @@ -1,6 +1,6 @@ Name: virt-what Version: 1.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Detect if we are running in a virtual machine License: GPLv2+ @@ -11,10 +11,13 @@ Source0: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{versi Source1: copy-patches.sh # Patches are maintained in the following repository: -# http://git.annexia.org/?p=virt-what.git;a=shortlog;h=refs/heads/rhel-8.7 +# http://git.annexia.org/?p=virt-what.git;a=shortlog;h=refs/heads/rhel-8.8 # Patches. -#(no patches) +Patch0001: 0001-Rearrange-lxc-test-to-avoid-use-of-cat.patch +Patch0002: 0002-Move-docker-and-podman-tests-up-add-comments.patch +Patch0003: 0003-podman-Fix-location-of-test-file-proc-1-environ.patch +Patch0004: 0004-Detect-OCI-containers.patch BuildRequires: make BuildRequires: git @@ -121,6 +124,10 @@ fi %changelog +* Thu Jan 05 2023 Richard W.M. Jones - 1.25-2 +- Add support for OCI containers + resolves: rhbz#2155233 + * Wed Aug 17 2022 Richard W.M. Jones - 1.25-1 - Rebase to 1.25 resolves: rhbz#2118195