summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-05-26 15:35:19 -0400
committerGitHub <noreply@github.com>2022-05-26 15:35:19 -0400
commit1736f2fe607a82d066497aba330d6a81a07f5164 (patch)
treedfa7fa6ed65779612388223e801d3365df384203
parente709cc88e7c68208a490d0a6eabe9488d5220b6c (diff)
parent87ad4606032f856b9d09e2310fc59604744ab2c9 (diff)
downloadpodman-1736f2fe607a82d066497aba330d6a81a07f5164.tar.gz
podman-1736f2fe607a82d066497aba330d6a81a07f5164.tar.bz2
podman-1736f2fe607a82d066497aba330d6a81a07f5164.zip
Merge pull request #14382 from jwhonce/wip/init_todo
Remove TODO comment
-rw-r--r--cmd/podman/machine/init.go9
1 files changed, 3 insertions, 6 deletions
diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go
index 6c31f3531..612c36057 100644
--- a/cmd/podman/machine/init.go
+++ b/cmd/podman/machine/init.go
@@ -25,16 +25,14 @@ var (
Example: `podman machine init myvm`,
ValidArgsFunction: completion.AutocompleteNone,
}
-)
-var (
initOpts = machine.InitOptions{}
defaultMachineName = machine.DefaultMachineName
now bool
)
// maxMachineNameSize is set to thirty to limit huge machine names primarily
-// because macos has a much smaller file size limit.
+// because macOS has a much smaller file size limit.
const maxMachineNameSize = 30
func init() {
@@ -111,8 +109,7 @@ func init() {
flags.BoolVar(&initOpts.Rootful, rootfulFlagName, false, "Whether this machine should prefer rootful container execution")
}
-// TODO should we allow for a users to append to the qemu cmdline?
-func initMachine(cmd *cobra.Command, args []string) error {
+func initMachine(_ *cobra.Command, args []string) error {
var (
err error
vm machine.VM
@@ -122,7 +119,7 @@ func initMachine(cmd *cobra.Command, args []string) error {
initOpts.Name = defaultMachineName
if len(args) > 0 {
if len(args[0]) > maxMachineNameSize {
- return errors.New("machine name must be 30 characters or less")
+ return errors.Errorf("machine name %q must be %d characters or less", args[0], maxMachineNameSize)
}
initOpts.Name = args[0]
}