diff options
| author | Toshiki Sonoda <sonoda.toshiki@fujitsu.com> | 2022-07-19 10:00:53 +0900 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2022-07-26 13:38:10 -0400 |
| commit | 6057db75d81101fcfe2e63debedd8d0029461de4 (patch) | |
| tree | ec79c4aa9d22770f049e72f01183c67023b10708 | |
| parent | de8d2cc9444c82196cc234582359ca98aa2708ec (diff) | |
| download | podman-6057db75d81101fcfe2e63debedd8d0029461de4.tar.gz podman-6057db75d81101fcfe2e63debedd8d0029461de4.tar.bz2 podman-6057db75d81101fcfe2e63debedd8d0029461de4.zip | |
Remove return error from "containers.pause"
When we pause `rootless cgroups v1 container`, podman returns error from `libpod.(*Container).pause`.
Podman does not need to return error from `containers.pause` because of duplicate.
[NO NEW TESTS NEEDED]
Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
| -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") |