aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-01-10 12:46:33 +0100
committerGitHub <noreply@github.com>2020-01-10 12:46:33 +0100
commit8acc1dc6c919016eabcc30f08260769b56c98003 (patch)
tree448d7d9433603c0908c3af54a72a6d828ff2a169
parentf57fdd038d431ebbd59e39b909cab7543b5d8f01 (diff)
parent751c403d8b74d3e9211c59ee01872e1e2f45b258 (diff)
downloadpodman-8acc1dc6c919016eabcc30f08260769b56c98003.tar.gz
podman-8acc1dc6c919016eabcc30f08260769b56c98003.tar.bz2
podman-8acc1dc6c919016eabcc30f08260769b56c98003.zip
Merge pull request #4828 from giuseppe/drop-pause-check
cp: drop check for rootless
-rw-r--r--cmd/podman/cp.go13
1 files changed, 1 insertions, 12 deletions
diff --git a/cmd/podman/cp.go b/cmd/podman/cp.go
index 1e4491f33..ea97752a3 100644
--- a/cmd/podman/cp.go
+++ b/cmd/podman/cp.go
@@ -101,18 +101,7 @@ func copyBetweenHostAndContainer(runtime *libpod.Runtime, src string, dest strin
}
}()
- // We can't pause rootless containers.
- if pause && rootless.IsRootless() {
- state, err := ctr.State()
- if err != nil {
- return err
- }
- if state == define.ContainerStateRunning {
- return errors.Errorf("cannot copy into running rootless container with pause set - pass --pause=false to force copying")
- }
- }
-
- if pause && !rootless.IsRootless() {
+ if pause {
if err := ctr.Pause(); err != nil {
// An invalid state error is fine.
// The container isn't running or is already paused.