diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-11 05:23:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 05:23:34 -0500 |
| commit | ca354f13f28896351e910da72f946e21bac2c6b0 (patch) | |
| tree | 8c980caaff587953bf3c9e3c73918a62c8fe42d1 /libpod/volume.go | |
| parent | db64865164b72af7017e9d3c34e75ee3bfd8546e (diff) | |
| parent | ea910fc53537d8c6f8cd1e1eaad49eaa5906c5f5 (diff) | |
| download | podman-ca354f13f28896351e910da72f946e21bac2c6b0.tar.gz podman-ca354f13f28896351e910da72f946e21bac2c6b0.tar.bz2 podman-ca354f13f28896351e910da72f946e21bac2c6b0.zip | |
Merge pull request #9308 from mheon/fix_6003
Rewrite copy-up to use buildah Copier
Diffstat (limited to 'libpod/volume.go')
| -rw-r--r-- | libpod/volume.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libpod/volume.go b/libpod/volume.go index 4c137cb8e..5cc5e7e40 100644 --- a/libpod/volume.go +++ b/libpod/volume.go @@ -130,11 +130,18 @@ func (v *Volume) MountPoint() (string, error) { if err := v.update(); err != nil { return "", err } + } + + return v.mountPoint(), nil +} - return v.state.MountPoint, nil +// Internal-only helper for volume mountpoint +func (v *Volume) mountPoint() string { + if v.UsesVolumeDriver() { + return v.state.MountPoint } - return v.config.MountPoint, nil + return v.config.MountPoint } // Options return the volume's options |