summaryrefslogtreecommitdiff
path: root/libpod/container_top_linux.go
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-05-23 14:45:14 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-05-23 14:45:17 +0200
commite85b33fb0403f0e75bd017aba231a906b83bd444 (patch)
treec12ece4679a846949605f752c8847e356042ab78 /libpod/container_top_linux.go
parentda3021edd15cdf6313627c9f6a787929bc088725 (diff)
downloadpodman-e85b33fb0403f0e75bd017aba231a906b83bd444.tar.gz
podman-e85b33fb0403f0e75bd017aba231a906b83bd444.tar.bz2
podman-e85b33fb0403f0e75bd017aba231a906b83bd444.zip
rootless: fix top huser and hgroup
when running in rootless mode, be sure psgo is honoring the user namespace settings for huser and hgroup. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'libpod/container_top_linux.go')
-rw-r--r--libpod/container_top_linux.go5
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
}