When location of c/storage root changes, set VolumePath

We want named volumes to be created in a subdirectory of the
c/storage graph root, the same as the libpod root directory is
now. As such, we need to adjust its location when the graph root
changes location.

Also, make a change to how we set the default. There's no need to
explicitly set it every time we initialize via an option - that
might conflict with WithStorageConfig setting it based on graph
root changes. Instead, just initialize it in the default config
like our other settings.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>

1 files changed, 4 insertions, 0 deletions

diff --git a/libpod/options.go b/libpod/options.go
index e22c81f91..675ebffda 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -47,6 +47,10 @@ 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")
+
 			setField = true
 		}