From 5a2ca77b9babc44993ff1f7d7681ea21597fe3db Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 26 Sep 2021 06:17:53 -0400 Subject: Vendor in containers/common v0.46.0 Fixes: https://github.com/containers/podman/issues/11745 [NO TESTS NEEDED] Since this is just a revendor and a one line change for the revendor Signed-off-by: Daniel J Walsh Signed-off-by: Valentin Rothberg --- cmd/podman/machine/init.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/podman') diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index 19f31d1a6..5dfff5143 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -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" -- cgit v1.2.3-54-g00ecf From 3600054d1354134c3ff3ec1fed9f29d36b2ef313 Mon Sep 17 00:00:00 2001 From: Ashley Cui Date: Fri, 24 Sep 2021 15:41:57 -0400 Subject: 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 --- cmd/podman/machine/init.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmd/podman') 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) -- cgit v1.2.3-54-g00ecf