diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-03 21:12:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-03 21:12:30 +0200 |
| commit | 24156f95fb8a14a9d9f58b435b98ce552c2008b9 (patch) | |
| tree | 069901076954f8ff5625c707212e34084a8d2e79 /libpod/runtime_ctr.go | |
| parent | 697ec8f6f0ac8f251fd7f3f3bb5e21313ca62207 (diff) | |
| parent | 17ce567c6827abdcd517699bc07e82ccf48f7619 (diff) | |
| download | podman-24156f95fb8a14a9d9f58b435b98ce552c2008b9.tar.gz podman-24156f95fb8a14a9d9f58b435b98ce552c2008b9.tar.bz2 podman-24156f95fb8a14a9d9f58b435b98ce552c2008b9.zip | |
Merge pull request #10177 from giuseppe/always-honor-cgroup-parent
cgroup: always honor --cgroup-parent
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 0acf88cbc..328f47c12 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -296,7 +296,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai return nil, errors.Wrapf(define.ErrInternal, "pod %s cgroup is not set", pod.ID()) } ctr.config.CgroupParent = podCgroup - } else { + } else if !rootless.IsRootless() { ctr.config.CgroupParent = CgroupfsDefaultCgroupParent } } else if strings.HasSuffix(path.Base(ctr.config.CgroupParent), ".slice") { |