aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2017-05-03 16:47:04 +0100
committerBryn M. Reeves <bmr@redhat.com>2017-05-03 16:47:04 +0100
commit5e3ae1cf78cbd7dd122ed229add39e89aefdc21e (patch)
tree4980cb4fa456927096f9c3dee744267bd1ab31b0
parenta81243cdd3f0e7db152251caeb478c19cd801277 (diff)
downloadsos-5e3ae1cf78cbd7dd122ed229add39e89aefdc21e.tar.gz
[policies/redhat] accept 'oci' as a valid container type
Currently the Red Hat container policy accepts 'container=docker' as a valid indication that we are running in a container and to enable sysroot and host sysroot checks. More recent Red Hat container infrastructure has change to setting 'container=oci', so recognise this value as well. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/policies/redhat.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sos/policies/redhat.py b/sos/policies/redhat.py
index a1565c63..a6e3712c 100644
--- a/sos/policies/redhat.py
+++ b/sos/policies/redhat.py
@@ -84,7 +84,7 @@ class RedHatPolicy(LinuxPolicy):
specific initialisation based on ENV_HOST_SYSROOT.
"""
if ENV_CONTAINER in os.environ:
- if os.environ[ENV_CONTAINER] == 'docker':
+ if os.environ[ENV_CONTAINER] in ['docker', 'oci']:
self._in_container = True
if ENV_HOST_SYSROOT in os.environ:
self._host_sysroot = os.environ[ENV_HOST_SYSROOT]