From cb91d9083547cdd1524fc6dcb30011b48277e470 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 Nov 2025 14:29:37 -0500 Subject: [PATCH] libpod/runtime_pod_linux.go: Remove Cgroups v1 Signed-off-by: Lokesh Mandvekar --- libpod/runtime_pod_linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index f5804decc0..b52b565ba5 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -122,7 +122,7 @@ func (p *Pod) removePodCgroup() error { // hard - instead, just log errors. conmonCgroupPath := filepath.Join(p.state.CgroupPath, "conmon") conmonCgroup, err := cgroups.Load(conmonCgroupPath) - if err != nil && err != cgroups.ErrCgroupDeleted && err != cgroups.ErrCgroupV1Rootless { + if err != nil && err != cgroups.ErrCgroupDeleted { return fmt.Errorf("retrieving pod %s conmon cgroup: %w", p.ID(), err) } if err == nil { @@ -131,7 +131,7 @@ func (p *Pod) removePodCgroup() error { } } cgroup, err := cgroups.Load(p.state.CgroupPath) - if err != nil && err != cgroups.ErrCgroupDeleted && err != cgroups.ErrCgroupV1Rootless { + if err != nil && err != cgroups.ErrCgroupDeleted { return fmt.Errorf("retrieving pod %s cgroup: %w", p.ID(), err) } if err == nil {