summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2019-04-09 12:55:19 -0600
committerEd Santiago <santiago@redhat.com>2019-04-09 12:55:19 -0600
commitcebb7ebbeec0ec9aaf50fde3347b9b51c0c8882a (patch)
tree30881fb02a1de55704ab95871223ed2d246b4f2b /cmd/podman
parentfe79bdd07e140176dc64ebef8da3eea2ae28b96b (diff)
downloadpodman-cebb7ebbeec0ec9aaf50fde3347b9b51c0c8882a.tar.gz
podman-cebb7ebbeec0ec9aaf50fde3347b9b51c0c8882a.tar.bz2
podman-cebb7ebbeec0ec9aaf50fde3347b9b51c0c8882a.zip
ps: now works with --size and nonroot
Revert the error check from #2832. This is not strictly necessary, since 'podman ps --size' now works perfectly fine in nonroot because some recent change (Giuseppe's, presumably) masked os.Geteuid() return 0... but removing for maintainability's sake. Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/ps.go4
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