diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-09 12:51:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 12:51:11 -0700 |
| commit | 40a1df38d1b6971dd1df9e06bf190c924dbad5a3 (patch) | |
| tree | 30881fb02a1de55704ab95871223ed2d246b4f2b /cmd/podman/ps.go | |
| parent | fe79bdd07e140176dc64ebef8da3eea2ae28b96b (diff) | |
| parent | cebb7ebbeec0ec9aaf50fde3347b9b51c0c8882a (diff) | |
| download | podman-40a1df38d1b6971dd1df9e06bf190c924dbad5a3.tar.gz podman-40a1df38d1b6971dd1df9e06bf190c924dbad5a3.tar.bz2 podman-40a1df38d1b6971dd1df9e06bf190c924dbad5a3.zip | |
Merge pull request #2881 from edsantiago/revert_2832
ps: now works with --size and nonroot
Diffstat (limited to 'cmd/podman/ps.go')
| -rw-r--r-- | cmd/podman/ps.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go index 759a03b86..01aa5312e 100644 --- a/cmd/podman/ps.go +++ b/cmd/podman/ps.go @@ -205,10 +205,6 @@ func psCmd(c *cliconfig.PsValues) error { span, _ := opentracing.StartSpanFromContext(Ctx, "psCmd") defer span.Finish() } - // TODO disable when single rootless userns merges - if c.Bool("size") && os.Geteuid() != 0 { - return errors.New("the --size option is not presently supported without root") - } var watch bool |