diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-15 16:18:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-15 16:18:18 +0000 |
| commit | ed755cb14e13e8391c1bb33cb0ff038178c4461d (patch) | |
| tree | 225cbd12d322bbdf904c2bdce2ac428cb862f22e /libpod/oci_conmon_linux.go | |
| parent | 08f35dab5a1dc961992430373415492cf7c1963a (diff) | |
| parent | 751ba07a76a15ba2965886597c85152c541f3517 (diff) | |
| download | podman-ed755cb14e13e8391c1bb33cb0ff038178c4461d.tar.gz podman-ed755cb14e13e8391c1bb33cb0ff038178c4461d.tar.bz2 podman-ed755cb14e13e8391c1bb33cb0ff038178c4461d.zip | |
Merge pull request #14596 from giuseppe/move-conmon-different-cgroup-system-service
libpod: improve check to create conmon cgroup
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 6cb38717a..fde8624b0 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1435,7 +1435,7 @@ func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec } // $INVOCATION_ID is set by systemd when running as a service. - if os.Getenv("INVOCATION_ID") != "" { + if ctr.runtime.RemoteURI() == "" && os.Getenv("INVOCATION_ID") != "" { mustCreateCgroup = false } |