diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-23 20:38:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-23 20:38:12 +0200 |
| commit | 1dbb27365ac017a344f52e2cef3e4836b264cd4e (patch) | |
| tree | 2acecb887f2c4a28d83518a8bbd2aa231fccf66f /libpod/container_top_linux.go | |
| parent | 579fd01f7df929373a6b68a4c4dda17084832db4 (diff) | |
| parent | e85b33fb0403f0e75bd017aba231a906b83bd444 (diff) | |
| download | podman-1dbb27365ac017a344f52e2cef3e4836b264cd4e.tar.gz podman-1dbb27365ac017a344f52e2cef3e4836b264cd4e.tar.bz2 podman-1dbb27365ac017a344f52e2cef3e4836b264cd4e.zip | |
Merge pull request #3190 from giuseppe/fix-userns-psgo
rootless: fix top huser and hgroup
Diffstat (limited to 'libpod/container_top_linux.go')
| -rw-r--r-- | libpod/container_top_linux.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libpod/container_top_linux.go b/libpod/container_top_linux.go index 392a7029e..2e0e83c05 100644 --- a/libpod/container_top_linux.go +++ b/libpod/container_top_linux.go @@ -6,6 +6,7 @@ import ( "strconv" "strings" + "github.com/containers/libpod/pkg/rootless" "github.com/containers/psgo" "github.com/pkg/errors" ) @@ -47,7 +48,9 @@ func (c *Container) GetContainerPidInformation(descriptors []string) ([]string, // filters on the data. We need to change the API here and the // varlink API to return a [][]string if we want to make use of // filtering. - psgoOutput, err := psgo.JoinNamespaceAndProcessInfo(pid, descriptors) + opts := psgo.JoinNamespaceOpts{FillMappings: rootless.IsRootless()} + + psgoOutput, err := psgo.JoinNamespaceAndProcessInfoWithOptions(pid, descriptors, &opts) if err != nil { return nil, err } |