summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2019-02-26 15:44:46 -0500
committerMatthew Heon <matthew.heon@pm.me>2019-02-26 15:44:46 -0500
commitf68a243f8ee4d36990a50fa490dc427520dc8a14 (patch)
tree4896416c5cdc18ecf5624a4baf1e1551fb94d74e /libpod
parent5511cdc4879925c14243be915c51fd7e02d7a2f7 (diff)
downloadpodman-f68a243f8ee4d36990a50fa490dc427520dc8a14.tar.gz
podman-f68a243f8ee4d36990a50fa490dc427520dc8a14.tar.bz2
podman-f68a243f8ee4d36990a50fa490dc427520dc8a14.zip
Centralize setting default volume path
No reason to do it in util/ anymore. It's always going to be a subdirectory of c/storage graph root by default, so we can just set it after the return. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/runtime.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 635783790..f53cdd8b8 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -331,13 +331,13 @@ func NewRuntime(options ...RuntimeOption) (runtime *Runtime, err error) {
deepcopier.Copy(defaultRuntimeConfig).To(runtime.config)
runtime.config.TmpDir = tmpDir
- storageConf, volumePath, err := util.GetDefaultStoreOptions()
+ storageConf, err := util.GetDefaultStoreOptions()
if err != nil {
return nil, errors.Wrapf(err, "error retrieving rootless storage config")
}
runtime.config.StorageConfig = storageConf
runtime.config.StaticDir = filepath.Join(storageConf.GraphRoot, "libpod")
- runtime.config.VolumePath = volumePath
+ runtime.config.VolumePath = filepath.Join(storageConf.GraphRoot, "volumes")
configPath := ConfigPath
foundConfig := true