summaryrefslogtreecommitdiff
path: root/cmd/podman
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 /cmd/podman
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 'cmd/podman')
-rw-r--r--cmd/podman/machine/rm.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/machine/rm.go b/cmd/podman/machine/rm.go
index 38873084a..3e5d5fb0b 100644
--- a/cmd/podman/machine/rm.go
+++ b/cmd/podman/machine/rm.go
@@ -37,7 +37,7 @@ func init() {
flags := rmCmd.Flags()
formatFlagName := "force"
- flags.BoolVar(&destoryOptions.Force, formatFlagName, false, "Do not prompt before rming")
+ flags.BoolVarP(&destoryOptions.Force, formatFlagName, "f", false, "Stop and do not prompt before rming")
keysFlagName := "save-keys"
flags.BoolVar(&destoryOptions.SaveKeys, keysFlagName, false, "Do not delete SSH keys")
@@ -64,7 +64,7 @@ func rm(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
- confirmationMessage, remove, err := vm.Remove(vmName, machine.RemoveOptions{})
+ confirmationMessage, remove, err := vm.Remove(vmName, destoryOptions)
if err != nil {
return err
}