Skip to content

Commit faa551a

Browse files
committed
libpod/runtime_ctr.go: Remove Cgroups v1
Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent 72f8a01 commit faa551a

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

libpod/runtime_ctr.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"github.com/opencontainers/runtime-tools/generate"
2929
"github.com/sirupsen/logrus"
3030
"go.podman.io/common/libnetwork/types"
31-
"go.podman.io/common/pkg/cgroups"
3231
"go.podman.io/common/pkg/config"
3332
"go.podman.io/storage"
3433
"go.podman.io/storage/pkg/stringid"
@@ -861,18 +860,6 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, opts ctrRmO
861860
}
862861

863862
if c.state.State == define.ContainerStatePaused {
864-
isV2, err := cgroups.IsCgroup2UnifiedMode()
865-
if err != nil {
866-
retErr = err
867-
return removedCtrs, removedPods, retErr
868-
}
869-
// cgroups v1 and v2 handle signals on paused processes differently
870-
if !isV2 {
871-
if err := c.unpause(); err != nil {
872-
retErr = err
873-
return removedCtrs, removedPods, retErr
874-
}
875-
}
876863
if err := c.ociRuntime.KillContainer(c, 9, false); err != nil {
877864
retErr = err
878865
return removedCtrs, removedPods, retErr

0 commit comments

Comments
 (0)