summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-04-03 16:29:30 -0700
committerGitHub <noreply@github.com>2019-04-03 16:29:30 -0700
commit4bda5378b1434951dbbdf1b6101d662cbf708098 (patch)
tree082096c99236e9745666e4daf7c13fdf6508a21f /cmd
parent7a2bca54f0194d7a4c5362e8e2a969ce54a367ba (diff)
parentc1cd9a3c6d005ee80d6c0563e2d3a806e7b4f63c (diff)
downloadpodman-4bda5378b1434951dbbdf1b6101d662cbf708098.tar.gz
podman-4bda5378b1434951dbbdf1b6101d662cbf708098.tar.bz2
podman-4bda5378b1434951dbbdf1b6101d662cbf708098.zip
Merge pull request #2832 from mheon/rootless_size_errors
--size does not work with rootless at present
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/ps.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go
index 1f8db2739..71c8dee97 100644
--- a/cmd/podman/ps.go
+++ b/cmd/podman/ps.go
@@ -209,6 +209,10 @@ 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