diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-07-01 08:46:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-01 08:46:11 +0000 |
| commit | 96e72d90b8a6b1d9fb71dadfddff1ed4ccf05857 (patch) | |
| tree | cf1617923f618ae0bf1819486f4f425310245db8 /libpod/runtime.go | |
| parent | 01beba3667851c1dd68d3df1e0aa6bc8cb1ec0eb (diff) | |
| parent | 7b3e43c1f6cf27a1cde96c0f650a793a56cebc4c (diff) | |
| download | podman-96e72d90b8a6b1d9fb71dadfddff1ed4ccf05857.tar.gz podman-96e72d90b8a6b1d9fb71dadfddff1ed4ccf05857.tar.bz2 podman-96e72d90b8a6b1d9fb71dadfddff1ed4ccf05857.zip | |
Merge pull request #14449 from cdoern/podVolumes
podman volume create --opt=o=timeout...
Diffstat (limited to 'libpod/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 11ec750b1..da57c20c7 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -1194,9 +1194,11 @@ func (r *Runtime) reloadStorageConf() error { return nil } -// getVolumePlugin gets a specific volume plugin given its name. -func (r *Runtime) getVolumePlugin(name string) (*plugin.VolumePlugin, error) { +// getVolumePlugin gets a specific volume plugin. +func (r *Runtime) getVolumePlugin(volConfig *VolumeConfig) (*plugin.VolumePlugin, error) { // There is no plugin for local. + name := volConfig.Driver + timeout := volConfig.Timeout if name == define.VolumeDriverLocal || name == "" { return nil, nil } @@ -1206,7 +1208,7 @@ func (r *Runtime) getVolumePlugin(name string) (*plugin.VolumePlugin, error) { return nil, errors.Wrapf(define.ErrMissingPlugin, "no volume plugin with name %s available", name) } - return plugin.GetVolumePlugin(name, pluginPath) + return plugin.GetVolumePlugin(name, pluginPath, timeout) } // GetSecretsStorageDir returns the directory that the secrets manager should take |