summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-11-09 05:40:28 -0800
committerGitHub <noreply@github.com>2018-11-09 05:40:28 -0800
commitace93e6a484ba5b864e1afeee131e5a576db9f77 (patch)
tree6ab7f3064ce4b399c704bdd5eefaaeb7dfe7c58d
parentf5473c6cc3ac3418d257fe6aaaf40a5d13fdb281 (diff)
parent615df2ecd7ecc4a211d6293c753eea21cf0baab2 (diff)
downloadpodman-ace93e6a484ba5b864e1afeee131e5a576db9f77.tar.gz
podman-ace93e6a484ba5b864e1afeee131e5a576db9f77.tar.bz2
podman-ace93e6a484ba5b864e1afeee131e5a576db9f77.zip
Merge pull request #1793 from vrothberg/rootless-info
info: add rootless field
-rw-r--r--libpod/info.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/libpod/info.go b/libpod/info.go
index 4cbf3f734..5d8d160c8 100644
--- a/libpod/info.go
+++ b/libpod/info.go
@@ -12,6 +12,7 @@ import (
"strings"
"time"
+ "github.com/containers/libpod/pkg/rootless"
"github.com/containers/libpod/utils"
"github.com/containers/storage/pkg/system"
"github.com/pkg/errors"
@@ -30,6 +31,7 @@ func (r *Runtime) hostInfo() (map[string]interface{}, error) {
info["os"] = runtime.GOOS
info["arch"] = runtime.GOARCH
info["cpus"] = runtime.NumCPU()
+ info["rootless"] = rootless.IsRootless()
mi, err := system.ReadMemInfo()
if err != nil {
return nil, errors.Wrapf(err, "error reading memory info")