mirror of
https://github.com/containers/podman.git
synced 2025-06-24 19:42:56 +08:00
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>
This commit is contained in:

committed by
Valentin Rothberg

parent
5a2ca77b9b
commit
3600054d13
@ -42,7 +42,7 @@ func init() {
|
|||||||
cpusFlagName := "cpus"
|
cpusFlagName := "cpus"
|
||||||
flags.Uint64Var(
|
flags.Uint64Var(
|
||||||
&initOpts.CPUS,
|
&initOpts.CPUS,
|
||||||
cpusFlagName, 1,
|
cpusFlagName, cfg.Machine.CPUs,
|
||||||
"Number of CPUs",
|
"Number of CPUs",
|
||||||
)
|
)
|
||||||
_ = initCmd.RegisterFlagCompletionFunc(cpusFlagName, completion.AutocompleteNone)
|
_ = initCmd.RegisterFlagCompletionFunc(cpusFlagName, completion.AutocompleteNone)
|
||||||
@ -50,7 +50,7 @@ func init() {
|
|||||||
diskSizeFlagName := "disk-size"
|
diskSizeFlagName := "disk-size"
|
||||||
flags.Uint64Var(
|
flags.Uint64Var(
|
||||||
&initOpts.DiskSize,
|
&initOpts.DiskSize,
|
||||||
diskSizeFlagName, 10,
|
diskSizeFlagName, cfg.Machine.DiskSize,
|
||||||
"Disk size in GB",
|
"Disk size in GB",
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -59,7 +59,7 @@ func init() {
|
|||||||
memoryFlagName := "memory"
|
memoryFlagName := "memory"
|
||||||
flags.Uint64VarP(
|
flags.Uint64VarP(
|
||||||
&initOpts.Memory,
|
&initOpts.Memory,
|
||||||
memoryFlagName, "m", 2048,
|
memoryFlagName, "m", cfg.Machine.Memory,
|
||||||
"Memory in MB",
|
"Memory in MB",
|
||||||
)
|
)
|
||||||
_ = initCmd.RegisterFlagCompletionFunc(memoryFlagName, completion.AutocompleteNone)
|
_ = initCmd.RegisterFlagCompletionFunc(memoryFlagName, completion.AutocompleteNone)
|
||||||
|
Reference in New Issue
Block a user