diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-03 11:35:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 11:35:13 -0700 |
| commit | 3750b35ae2a22e7f7bc0070c5c2dadf1ef437074 (patch) | |
| tree | c5eee413a0cd57375f464084581704fc6bd22b00 /libpod/runtime_pod_linux.go | |
| parent | 2a3e3e7f25d9a7bbe5e6f3f35027ccbe6521961f (diff) | |
| parent | 14473270d7af520dae006605ab798ad9db34f184 (diff) | |
| download | podman-3750b35ae2a22e7f7bc0070c5c2dadf1ef437074.tar.gz podman-3750b35ae2a22e7f7bc0070c5c2dadf1ef437074.tar.bz2 podman-3750b35ae2a22e7f7bc0070c5c2dadf1ef437074.zip | |
Merge pull request #1578 from baude/addubuntuci
Add Ubuntu-18.04 to CI testing
Diffstat (limited to 'libpod/runtime_pod_linux.go')
| -rw-r--r-- | libpod/runtime_pod_linux.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index 974cd2b68..eb3d471dd 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -265,7 +265,8 @@ func (r *Runtime) removePod(ctx context.Context, p *Pod, removeCtrs, force bool) } case CgroupfsCgroupsManager: // Delete the cgroupfs cgroup - cgroup, err := cgroups.Load(cgroups.V1, cgroups.StaticPath(p.state.CgroupPath)) + v1CGroups := GetV1CGroups(getExcludedCGroups()) + cgroup, err := cgroups.Load(v1CGroups, cgroups.StaticPath(p.state.CgroupPath)) if err != nil && err != cgroups.ErrCgroupDeleted { return err } else if err == nil { |