diff options
| author | baude <bbaude@redhat.com> | 2018-10-01 12:10:46 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2018-10-03 12:45:37 -0500 |
| commit | 14473270d7af520dae006605ab798ad9db34f184 (patch) | |
| tree | 3224b4b540df5adccc615f5adede8c3e3db7eb90 /libpod/runtime_pod_linux.go | |
| parent | 230edff5216d0a7cedeff06c891450f8691b5aa2 (diff) | |
| download | podman-14473270d7af520dae006605ab798ad9db34f184.tar.gz podman-14473270d7af520dae006605ab798ad9db34f184.tar.bz2 podman-14473270d7af520dae006605ab798ad9db34f184.zip | |
Add ability for ubuntu to be tested
unfortunately the papr CI system cannot test ubuntu as a VM; therefore,
this PR still keeps travis. but it does include fixes that will be required
for running on modern versions of ubuntu.
Signed-off-by: baude <bbaude@redhat.com>
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 { |