opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14470 from shanesmith/machine-force-remove-doesnt-stop

Browse Source 
Stop machine before force removing files
This commit is contained in:
OpenShift Merge Robot
2022-06-03 04:29:02 -04:00
committed by GitHub
parent 6edbf3baaa b8de285a42
commit f7a54088c3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/machine/qemu/machine.go
View File

@ -831,9 +831,15 @@ func (v *MachineVM) Remove(_ string, opts machine.RemoveOptions) (string, func()
if err != nil { if err != nil {
return "", nil, err return "", nil, err
} }
if state == machine.Running && !opts.Force { if state == machine.Running {
if !opts.Force {
return "", nil, errors.Errorf("running vm %q cannot be destroyed", v.Name) return "", nil, errors.Errorf("running vm %q cannot be destroyed", v.Name)
} }
err := v.Stop(v.Name, machine.StopOptions{})
if err != nil {
return "", nil, err
}
}
// Collect all the files that need to be destroyed // Collect all the files that need to be destroyed
if !opts.SaveKeys { if !opts.SaveKeys {