Merge pull request #2397 from mheon/volume_path_fixes

Volume path fixes

1 files changed, 6 insertions, 0 deletions

diff --git a/libpod/options.go b/libpod/options.go
index e22c81f91..184d5d59f 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -47,6 +47,11 @@ func WithStorageConfig(config storage.StoreOptions) RuntimeOption {
 			rt.config.StaticDir = filepath.Join(config.GraphRoot, "libpod")
 			rt.configuredFrom.libpodStaticDirSet = true
 
+			// Also set libpod volume path, so we are a subdirectory
+			// of the c/storage store by default
+			rt.config.VolumePath = filepath.Join(config.GraphRoot, "volumes")
+			rt.configuredFrom.volPathSet = true
+
 			setField = true
 		}
 
@@ -359,6 +364,7 @@ func WithVolumePath(volPath string) RuntimeOption {
 		}
 
 		rt.config.VolumePath = volPath
+		rt.configuredFrom.volPathSet = true
 
 		return nil
 	}