summaryrefslogtreecommitdiff
path: root/cmd/podman/libpodruntime
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2019-02-21 09:24:34 -0500
committerMatthew Heon <matthew.heon@pm.me>2019-02-26 09:37:00 -0500
commitda70c9db6fb92c69d722d51873840c4e54dbe86d (patch)
tree7749b59ef1ffe84dfc281b267d17fef522677012 /cmd/podman/libpodruntime
parent8a5e1038766b34f8cb4fbe53829ebb0dc8c0ca0a (diff)
downloadpodman-da70c9db6fb92c69d722d51873840c4e54dbe86d.tar.gz
podman-da70c9db6fb92c69d722d51873840c4e54dbe86d.tar.bz2
podman-da70c9db6fb92c69d722d51873840c4e54dbe86d.zip
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>
Diffstat (limited to 'cmd/podman/libpodruntime')
-rw-r--r--cmd/podman/libpodruntime/runtime.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
index 880b281bd..f4ddf3521 100644
--- a/cmd/podman/libpodruntime/runtime.go
+++ b/cmd/podman/libpodruntime/runtime.go
@@ -21,7 +21,7 @@ func GetRuntime(c *cliconfig.PodmanCommand) (*libpod.Runtime, error) {
func getRuntime(c *cliconfig.PodmanCommand, renumber bool) (*libpod.Runtime, error) {
options := []libpod.RuntimeOption{}
- storageOpts, volumePath, err := util.GetDefaultStoreOptions()
+ storageOpts, _, err := util.GetDefaultStoreOptions()
if err != nil {
return nil, err
}
@@ -120,7 +120,6 @@ func getRuntime(c *cliconfig.PodmanCommand, renumber bool) (*libpod.Runtime, err
infraCommand, _ := c.Flags().GetString("infra-command")
options = append(options, libpod.WithDefaultInfraCommand(infraCommand))
}
- options = append(options, libpod.WithVolumePath(volumePath))
if c.Flags().Changed("config") {
return libpod.NewRuntimeFromConfig(c.GlobalFlags.Config, options...)
}