summaryrefslogtreecommitdiff
path: root/libpod/volume_internal_linux.go
diff options
context:
space:
mode:
authorPhoenix The Fallen <thephoenixofthevoid@gmail.com>2021-03-24 22:53:53 +0300
committerPhoenix The Fallen <thephoenixofthevoid@gmail.com>2021-03-24 22:53:53 +0300
commitf2181141e1aea2bafef786d83b90eea54010854b (patch)
treeadff4fc974f5e3651ce243e48e33027bbc292fb7 /libpod/volume_internal_linux.go
parentaf91f27d85f4104267eea493f8588f8c6a2d01e3 (diff)
downloadpodman-f2181141e1aea2bafef786d83b90eea54010854b.tar.gz
podman-f2181141e1aea2bafef786d83b90eea54010854b.tar.bz2
podman-f2181141e1aea2bafef786d83b90eea54010854b.zip
[NO TESTS NEEDED] Fix rootless volume plugins
In a case of volume plugins with custom options. Signed-off-by: Phoenix The Fallen <thephoenixofthevoid@gmail.com>
Diffstat (limited to 'libpod/volume_internal_linux.go')
-rw-r--r--libpod/volume_internal_linux.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/libpod/volume_internal_linux.go b/libpod/volume_internal_linux.go
index 67ac41874..92391de1d 100644
--- a/libpod/volume_internal_linux.go
+++ b/libpod/volume_internal_linux.go
@@ -32,8 +32,10 @@ func (v *Volume) mount() error {
return nil
}
- // We cannot mount volumes as rootless.
- if rootless.IsRootless() {
+ // We cannot mount 'local' volumes as rootless.
+ if !v.UsesVolumeDriver() && rootless.IsRootless() {
+ // This check should only be applied to 'local' driver
+ // so Volume Drivers must be excluded
return errors.Wrapf(define.ErrRootless, "cannot mount volumes without root privileges")
}
@@ -137,8 +139,8 @@ func (v *Volume) unmount(force bool) error {
return nil
}
- // We cannot unmount volumes as rootless.
- if rootless.IsRootless() {
+ // We cannot unmount 'local' volumes as rootless.
+ if !v.UsesVolumeDriver() && rootless.IsRootless() {
// If force is set, just clear the counter and bail without
// error, so we can remove volumes from the state if they are in
// an awkward configuration.