Skip to content

Commit

Permalink
cp: drop check for rootless
Browse files Browse the repository at this point in the history
rootless containers can use pause on cgroups v2.

Whether it is possible or not to use pause depends from multiple
conditions, such as:

- be on a cgroup v2 unified hierarchy,
- using systemd cgroup manager,
- the kernel has the freezer controller,

The last one may fail for root as well.

Instead of trying to catch all the possible conditions in Podman, let
the OCI runtime complain if pause cannot be performed.

Closes: containers#4813

Signed-off-by: Giuseppe Scrivano <[email protected]>
  • Loading branch information
giuseppe committed Jan 10, 2020
1 parent f3fc10f commit 751c403
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions cmd/podman/cp.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 751c403

Please sign in to comment.