opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 01:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1793 from vrothberg/rootless-info

Browse Source 
info: add rootless field
This commit is contained in:
OpenShift Merge Robot
2018-11-09 05:40:28 -08:00
committed by GitHub
parent f5473c6cc3 615df2ecd7
commit ace93e6a48
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/info.go
View File

@ -12,6 +12,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/containers/libpod/pkg/rootless"
"github.com/containers/libpod/utils" "github.com/containers/libpod/utils"
"github.com/containers/storage/pkg/system" "github.com/containers/storage/pkg/system"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -30,6 +31,7 @@ func (r *Runtime) hostInfo() (map[string]interface{}, error) {
info["os"] = runtime.GOOS info["os"] = runtime.GOOS
info["arch"] = runtime.GOARCH info["arch"] = runtime.GOARCH
info["cpus"] = runtime.NumCPU() info["cpus"] = runtime.NumCPU()
info["rootless"] = rootless.IsRootless()
mi, err := system.ReadMemInfo() mi, err := system.ReadMemInfo()
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "error reading memory info") return nil, errors.Wrapf(err, "error reading memory info")