diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-22 06:56:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-22 06:56:33 -0400 |
| commit | 0d6af1438710acc03ef9e7395e1bc8ecf46f4294 (patch) | |
| tree | 14341c3d033e132c426c14cd2cf2f5618d4ec044 /cmd/podman/machine/init.go | |
| parent | 1fcefc94f9e3e6d9dedeccc83fa3964461519b7f (diff) | |
| parent | cc3790f332d989440eb1720e24e3619fc97c74ee (diff) | |
| download | podman-0d6af1438710acc03ef9e7395e1bc8ecf46f4294.tar.gz podman-0d6af1438710acc03ef9e7395e1bc8ecf46f4294.tar.bz2 podman-0d6af1438710acc03ef9e7395e1bc8ecf46f4294.zip | |
Merge pull request #13964 from rhatdan/rootfull
Switch all rootful to rootfull
Diffstat (limited to 'cmd/podman/machine/init.go')
| -rw-r--r-- | cmd/podman/machine/init.go | 15 |
1 files changed, 13 insertions, 2 deletions
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? |