diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-29 04:36:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 04:36:08 -0400 |
| commit | f0ae84f5120f7ec8d2fc16c6ae9e52725b5d4958 (patch) | |
| tree | 826ec0caf31315c6ac9f90d93f8b817637585599 | |
| parent | 5654c07f8f49021a7c7cdaeacfc5c1ea963a5927 (diff) | |
| parent | 8084c5ef241a7ced101454bc497d40f80e6ad840 (diff) | |
| download | podman-f0ae84f5120f7ec8d2fc16c6ae9e52725b5d4958.tar.gz podman-f0ae84f5120f7ec8d2fc16c6ae9e52725b5d4958.tar.bz2 podman-f0ae84f5120f7ec8d2fc16c6ae9e52725b5d4958.zip | |
Merge pull request #11773 from ashley-cui/machineconf3.4
[3.4] Backport Allow machine options to be set from containers.conf
| -rw-r--r-- | cmd/podman/machine/init.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index ee32e6442..f6ce9956e 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -39,7 +39,7 @@ func init() { cpusFlagName := "cpus" flags.Uint64Var( &initOpts.CPUS, - cpusFlagName, 1, + cpusFlagName, cfg.Machine.CPUs, "Number of CPUs", ) _ = initCmd.RegisterFlagCompletionFunc(cpusFlagName, completion.AutocompleteNone) @@ -47,7 +47,7 @@ func init() { diskSizeFlagName := "disk-size" flags.Uint64Var( &initOpts.DiskSize, - diskSizeFlagName, 10, + diskSizeFlagName, cfg.Machine.DiskSize, "Disk size in GB", ) @@ -56,7 +56,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) |