containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14382 from jwhonce/wip/init_todo 

Remove TODO comment
This commit is contained in:
OpenShift Merge Robot 2022-05-26 15:35:19 -04:00 committed by GitHub
parent e709cc88e7 87ad460603
commit 1736f2fe60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/podman/machine/init.go
View File

@ -25,16 +25,14 @@ var (
Example: `podman machine init myvm`, Example: `podman machine init myvm`,
ValidArgsFunction: completion.AutocompleteNone, ValidArgsFunction: completion.AutocompleteNone,
} }
)
var (
initOpts = machine.InitOptions{} initOpts = machine.InitOptions{}
defaultMachineName = machine.DefaultMachineName defaultMachineName = machine.DefaultMachineName
now bool now bool
) )
// maxMachineNameSize is set to thirty to limit huge machine names primarily // 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 const maxMachineNameSize = 30
func init() { func init() {
@ -111,8 +109,7 @@ func init() {
flags.BoolVar(&initOpts.Rootful, rootfulFlagName, false, "Whether this machine should prefer rootful container execution") 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(_ *cobra.Command, args []string) error {
func initMachine(cmd *cobra.Command, args []string) error {
var ( var (
err error err error
vm machine.VM vm machine.VM
@ -122,7 +119,7 @@ func initMachine(cmd *cobra.Command, args []string) error {
initOpts.Name = defaultMachineName initOpts.Name = defaultMachineName
if len(args) > 0 { if len(args) > 0 {
if len(args[0]) > maxMachineNameSize { 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] initOpts.Name = args[0]
} }