summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-26 17:02:03 +0100
committerGitHub <noreply@github.com>2019-02-26 17:02:03 +0100
commit36df2e70738ab277699e8240f62355a67a6b2edb (patch)
tree4d93d4383d90b110200c41561680c951cf14ba0a /cmd/podman
parent507ab29cfedbcc7503fe10c44ea9e331c5a3a5ca (diff)
parentba6f1acf07d1eddcd810cdb4265a8961770329c6 (diff)
downloadpodman-36df2e70738ab277699e8240f62355a67a6b2edb.tar.gz
podman-36df2e70738ab277699e8240f62355a67a6b2edb.tar.bz2
podman-36df2e70738ab277699e8240f62355a67a6b2edb.zip
Merge pull request #2397 from mheon/volume_path_fixes
Volume path fixes
Diffstat (limited to 'cmd/podman')
-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...)
}