aboutsummaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-10-11 15:02:04 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-10-11 15:02:04 -0400
commit7580c227348af2a0906a692ad6a44348dc3eefbc (patch)
tree9a6e70df21aef599654261114875e2a78c15e062 /libpod
parent00ebf3cf1885fc95c3c36021e717db1f1e7d63be (diff)
downloadpodman-7580c227348af2a0906a692ad6a44348dc3eefbc.tar.gz
podman-7580c227348af2a0906a692ad6a44348dc3eefbc.tar.bz2
podman-7580c227348af2a0906a692ad6a44348dc3eefbc.zip
Remove a volume with --force if container is running
Currently we are not passing the force flag down to the removal of the running container. If the container is running, and we set --force when removing the volume, the container should be stopped. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/runtime_volume_linux.go6
1 files changed, 1 insertions, 5 deletions
diff --git a/libpod/runtime_volume_linux.go b/libpod/runtime_volume_linux.go
index b08693529..ed3cc971c 100644
--- a/libpod/runtime_volume_linux.go
+++ b/libpod/runtime_volume_linux.go
@@ -230,11 +230,7 @@ func (r *Runtime) removeVolume(ctx context.Context, v *Volume, force bool, timeo
logrus.Debugf("Removing container %s (depends on volume %q)", ctr.ID(), v.Name())
- // TODO: do we want to set force here when removing
- // containers?
- // I'm inclined to say no, in case someone accidentally
- // wipes a container they're using...
- if err := r.removeContainer(ctx, ctr, false, false, false, timeout); err != nil {
+ if err := r.removeContainer(ctx, ctr, force, false, false, timeout); err != nil {
return errors.Wrapf(err, "error removing container %s that depends on volume %s", ctr.ID(), v.Name())
}
}