diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-04-21 17:03:45 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-04-21 17:05:16 -0400 |
| commit | cc3790f332d989440eb1720e24e3619fc97c74ee (patch) | |
| tree | f3861d4c3d17a7e9d0291a6f3288d6f9a411e373 /cmd | |
| parent | bdbd477c286b8bcf27a498d0f8b0e8ba7642a018 (diff) | |
| download | podman-cc3790f332d989440eb1720e24e3619fc97c74ee.tar.gz podman-cc3790f332d989440eb1720e24e3619fc97c74ee.tar.bz2 podman-cc3790f332d989440eb1720e24e3619fc97c74ee.zip | |
Switch all rootful to rootfull
We are inconsistent on the name, we should stick with rootfull.
[NO NEW TESTS NEEDED] Existing tests should handle this and no tests for
machines exists yet.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/machine/init.go | 15 | ||||
| -rw-r--r-- | cmd/podman/machine/set.go | 7 |
2 files changed, 17 insertions, 5 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? 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 { |