3 files changed, 25 insertions, 6 deletions
diff --git a/cmd/podman/containers/clone.go b/cmd/podman/containers/clone.go
index 8a1473608..6912da1fc 100644
--- a/cmd/podman/containers/clone.go
+++ b/cmd/podman/containers/clone.go
@@ -38,6 +38,9 @@ func cloneFlags(cmd *cobra.Command) {
 	runFlagName := "run"
 	flags.BoolVar(&ctrClone.Run, runFlagName, false, "run the new container")
 
+	forceFlagName := "force"
+	flags.BoolVarP(&ctrClone.Force, forceFlagName, "f", false, "force the existing container to be destroyed")
+
 	common.DefineCreateFlags(cmd, &ctrClone.CreateOpts, false, true)
 }
 func init() {
@@ -52,7 +55,7 @@ func init() {
 func clone(cmd *cobra.Command, args []string) error {
 	switch len(args) {
 	case 0:
-		return errors.Wrapf(define.ErrInvalidArg, "Must Specify at least 1 argument")
+		return errors.Wrapf(define.ErrInvalidArg, "must specify at least 1 argument")
 	case 2:
 		ctrClone.CreateOpts.Name = args[1]
 	case 3:
@@ -68,6 +71,10 @@ func clone(cmd *cobra.Command, args []string) error {
 			ctrClone.RawImageName = rawImageName
 		}
 	}
+	if ctrClone.Force && !ctrClone.Destroy {
+		return errors.Wrapf(define.ErrInvalidArg, "cannot set --force without --destroy")
+	}
+
 	ctrClone.ID = args[0]
 	ctrClone.CreateOpts.IsClone = true
 	rep, err := registry.ContainerEngine().ContainerClone(registry.GetContext(), ctrClone)
diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go
index 2d0afbf05..06c1f7248 100644
--- a/cmd/podman/machine/init.go
+++ b/cmd/podman/machine/init.go
@@ -12,6 +12,7 @@ import (
 	"github.com/containers/podman/v4/pkg/machine"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 var (
@@ -106,8 +107,18 @@ func init() {
 	flags.StringVar(&initOpts.IgnitionPath, IgnitionPathFlagName, "", "Path to ignition file")
 	_ = initCmd.RegisterFlagCompletionFunc(IgnitionPathFlagName, completion.AutocompleteDefault)
 
-	rootfulFlagName := "rootful"
-	flags.BoolVar(&initOpts.Rootful, rootfulFlagName, false, "Whether this machine should prefer rootful container execution")
+	rootfullFlagName := "rootfull"
+	flags.BoolVar(&initOpts.Rootfull, rootfullFlagName, false, "Whether this machine should prefer rootfull container execution")
+	flags.SetNormalizeFunc(aliasFlags)
+}
+
+// aliasFlags is a function to handle backwards compatibility with old flags
+func aliasFlags(f *pflag.FlagSet, name string) pflag.NormalizedName {
+	switch name {
+	case "rootful":
+		name = "rootfull"
+	}
+	return pflag.NormalizedName(name)
 }
 
 // TODO should we allow for a users to append to the qemu cmdline?
diff --git a/cmd/podman/machine/set.go b/cmd/podman/machine/set.go
index 4c15f1de1..b1dfb51da 100644
--- a/cmd/podman/machine/set.go
+++ b/cmd/podman/machine/set.go
@@ -17,7 +17,7 @@ var (
 		Long:              "Sets an updatable virtual machine setting",
 		RunE:              setMachine,
 		Args:              cobra.MaximumNArgs(1),
-		Example:           `podman machine set --rootful=false`,
+		Example:           `podman machine set --rootfull=false`,
 		ValidArgsFunction: completion.AutocompleteNone,
 	}
 )
@@ -33,8 +33,9 @@ func init() {
 	})
 	flags := setCmd.Flags()
 
-	rootfulFlagName := "rootful"
-	flags.BoolVar(&setOpts.Rootful, rootfulFlagName, false, "Whether this machine should prefer rootful container execution")
+	rootfullFlagName := "rootfull"
+	flags.BoolVar(&setOpts.Rootfull, rootfullFlagName, false, "Whether this machine should prefer rootfull container execution")
+	flags.SetNormalizeFunc(aliasFlags)
 }
 
 func setMachine(cmd *cobra.Command, args []string) error {