aboutsummaryrefslogtreecommitdiff
path: root/pkg/machine/qemu
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-03-09 03:51:55 -0500
committerGitHub <noreply@github.com>2022-03-09 03:51:55 -0500
commit3e870f8c8e3736e9c81473d45c8148d4de0e70c3 (patch)
treec17ad3b084e3f1124b59469957ab464375fc5976 /pkg/machine/qemu
parent951c681efae8374858b0d93c05cbf902230a89b7 (diff)
parent5b51b42cc86d6fe394e13ae9dd91f2ddefdb543e (diff)
downloadpodman-3e870f8c8e3736e9c81473d45c8148d4de0e70c3.tar.gz
podman-3e870f8c8e3736e9c81473d45c8148d4de0e70c3.tar.bz2
podman-3e870f8c8e3736e9c81473d45c8148d4de0e70c3.zip
Merge pull request #13466 from baude/machinermf
machine rm -f stops and removes machine
Diffstat (limited to 'pkg/machine/qemu')
-rw-r--r--pkg/machine/qemu/machine.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 43a79dae8..92d8d1854 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -679,7 +679,7 @@ func (v *MachineVM) Remove(name string, opts machine.RemoveOptions) (string, fun
if err != nil {
return "", nil, err
}
- if running {
+ if running && !opts.Force {
return "", nil, errors.Errorf("running vm %q cannot be destroyed", v.Name)
}