summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorAshley Cui <acui@redhat.com>2021-09-24 15:41:57 -0400
committerAshley Cui <acui@redhat.com>2021-09-28 17:20:25 -0400
commit8084c5ef241a7ced101454bc497d40f80e6ad840 (patch)
tree826ec0caf31315c6ac9f90d93f8b817637585599 /cmd/podman
parent5654c07f8f49021a7c7cdaeacfc5c1ea963a5927 (diff)
downloadpodman-8084c5ef241a7ced101454bc497d40f80e6ad840.tar.gz
podman-8084c5ef241a7ced101454bc497d40f80e6ad840.tar.bz2
podman-8084c5ef241a7ced101454bc497d40f80e6ad840.zip
Allow machine options to be set from containers.conf
CPUS, memory, disk size, and image path defaults can be set from [machine] table in containers.conf [NO TESTS NEEDED] Signed-off-by: Ashley Cui <acui@redhat.com>
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/machine/init.go6
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)