summaryrefslogtreecommitdiff
path: root/cmd/podman/machine
diff options
context:
space:
mode:
authorAshley Cui <acui@redhat.com>2021-09-24 15:41:57 -0400
committerValentin Rothberg <rothberg@redhat.com>2021-09-27 11:36:41 +0200
commit3600054d1354134c3ff3ec1fed9f29d36b2ef313 (patch)
tree16ee72da4969a1f481890dffa6e6ce296f79052d /cmd/podman/machine
parent5a2ca77b9babc44993ff1f7d7681ea21597fe3db (diff)
downloadpodman-3600054d1354134c3ff3ec1fed9f29d36b2ef313.tar.gz
podman-3600054d1354134c3ff3ec1fed9f29d36b2ef313.tar.bz2
podman-3600054d1354134c3ff3ec1fed9f29d36b2ef313.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/machine')
-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 5dfff5143..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)