diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-27 07:20:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 07:20:14 -0400 |
| commit | e27470ba97ae3dda32fb06b408da786f2b25a25d (patch) | |
| tree | 941996647df5650e9ce318b07b70f0c8967df67b /cmd/podman | |
| parent | 869cb9a65413cc99bf8ed0e158c0e2f7b0df513a (diff) | |
| parent | 3600054d1354134c3ff3ec1fed9f29d36b2ef313 (diff) | |
| download | podman-e27470ba97ae3dda32fb06b408da786f2b25a25d.tar.gz podman-e27470ba97ae3dda32fb06b408da786f2b25a25d.tar.bz2 podman-e27470ba97ae3dda32fb06b408da786f2b25a25d.zip | |
Merge pull request #11753 from vrothberg/VENDOR
Vendor in containers/common v0.46.0
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/machine/init.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index 19f31d1a6..adde887f7 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -42,7 +42,7 @@ func init() { cpusFlagName := "cpus" flags.Uint64Var( &initOpts.CPUS, - cpusFlagName, 1, + cpusFlagName, cfg.Machine.CPUs, "Number of CPUs", ) _ = initCmd.RegisterFlagCompletionFunc(cpusFlagName, completion.AutocompleteNone) @@ -50,7 +50,7 @@ func init() { diskSizeFlagName := "disk-size" flags.Uint64Var( &initOpts.DiskSize, - diskSizeFlagName, 10, + diskSizeFlagName, cfg.Machine.DiskSize, "Disk size in GB", ) @@ -59,7 +59,7 @@ func init() { memoryFlagName := "memory" flags.Uint64VarP( &initOpts.Memory, - memoryFlagName, "m", 2048, + memoryFlagName, "m", cfg.Machine.Memory, "Memory in MB", ) _ = initCmd.RegisterFlagCompletionFunc(memoryFlagName, completion.AutocompleteNone) @@ -71,7 +71,7 @@ func init() { ) ImagePathFlagName := "image-path" - flags.StringVar(&initOpts.ImagePath, ImagePathFlagName, cfg.Engine.MachineImage, "Path to qcow image") + flags.StringVar(&initOpts.ImagePath, ImagePathFlagName, cfg.Machine.Image, "Path to qcow image") _ = initCmd.RegisterFlagCompletionFunc(ImagePathFlagName, completion.AutocompleteDefault) IgnitionPathFlagName := "ignition-path" |