diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-20 12:01:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-20 12:01:10 +0200 |
| commit | 8c9eff5b12eebe318be1f905562be6a236285caa (patch) | |
| tree | eaf183ef9fd59b6fa3a534d01001610490c6c5ae /cmd/podman | |
| parent | 6d9f34c6301910892f7746dc93b226f7c16f8c2c (diff) | |
| parent | 26ae055a244d23f6396d96ea0f727bbc4d868c9b (diff) | |
| download | podman-8c9eff5b12eebe318be1f905562be6a236285caa.tar.gz podman-8c9eff5b12eebe318be1f905562be6a236285caa.tar.bz2 podman-8c9eff5b12eebe318be1f905562be6a236285caa.zip | |
Merge pull request #14945 from sstosh/pod-pause-cgroupv1
"podman pod pause" return error if cgroups v1 rootless container
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/containers/pause.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cmd/podman/containers/pause.go b/cmd/podman/containers/pause.go index 3c26fd5c8..af6f740f2 100644 --- a/cmd/podman/containers/pause.go +++ b/cmd/podman/containers/pause.go @@ -5,12 +5,10 @@ import ( "errors" "fmt" - "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v4/cmd/podman/common" "github.com/containers/podman/v4/cmd/podman/registry" "github.com/containers/podman/v4/cmd/podman/utils" "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/rootless" "github.com/spf13/cobra" "github.com/spf13/pflag" ) @@ -65,12 +63,6 @@ func pause(cmd *cobra.Command, args []string) error { var ( errs utils.OutputErrors ) - if rootless.IsRootless() && !registry.IsRemote() { - cgroupv2, _ := cgroups.IsCgroup2UnifiedMode() - if !cgroupv2 { - return errors.New("pause is not supported for cgroupv1 rootless containers") - } - } if len(args) < 1 && !pauseOpts.All { return errors.New("you must provide at least one container name or id") |