From cebb7ebbeec0ec9aaf50fde3347b9b51c0c8882a Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 9 Apr 2019 12:55:19 -0600 Subject: 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 --- cmd/podman/ps.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'cmd/podman') 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 -- cgit v1.2.3-54-g00ecf