diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-28 07:19:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 07:19:34 -0700 |
| commit | ef1b58e6f28d21959196d29d5e9ab065d4e9a818 (patch) | |
| tree | 691ecc024dfedff5695e426a8f3a6c077cfc34b8 /libpod/info.go | |
| parent | e7a2eecf5f3975edfb92cd2cacff0d34ef45f808 (diff) | |
| parent | a5443a532b0fc6bd787cbb472c0ad2f75447c9df (diff) | |
| download | podman-ef1b58e6f28d21959196d29d5e9ab065d4e9a818.tar.gz podman-ef1b58e6f28d21959196d29d5e9ab065d4e9a818.tar.bz2 podman-ef1b58e6f28d21959196d29d5e9ab065d4e9a818.zip | |
Merge pull request #2789 from vrothberg/vendor
vendor buildah, image, storage, cni
Diffstat (limited to 'libpod/info.go')
| -rw-r--r-- | libpod/info.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libpod/info.go b/libpod/info.go index 62088b730..b42f64a1f 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -13,8 +13,8 @@ import ( "github.com/containers/buildah" "github.com/containers/libpod/pkg/rootless" - "github.com/containers/libpod/pkg/util" "github.com/containers/libpod/utils" + "github.com/containers/storage" "github.com/containers/storage/pkg/system" "github.com/pkg/errors" ) @@ -116,12 +116,17 @@ func (r *Runtime) hostInfo() (map[string]interface{}, error) { func (r *Runtime) storeInfo() (map[string]interface{}, error) { // lets say storage driver in use, number of images, number of containers info := map[string]interface{}{} - info["ConfigFile"] = util.StorageConfigFile() info["GraphRoot"] = r.store.GraphRoot() info["RunRoot"] = r.store.RunRoot() info["GraphDriverName"] = r.store.GraphDriverName() info["GraphOptions"] = r.store.GraphOptions() info["VolumePath"] = r.config.VolumePath + + configFile, err := storage.DefaultConfigFile(rootless.IsRootless()) + if err != nil { + return nil, err + } + info["ConfigFile"] = configFile statusPairs, err := r.store.Status() if err != nil { return nil, err |