diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-26 10:13:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-26 10:13:08 -0400 |
| commit | 18da5b0bf6d83e31a3db534068af367816349cf0 (patch) | |
| tree | 2afeb5517d178f0708923982f9330bced93dc709 /cmd/podman | |
| parent | 54e0afffe7dd8e5ab7daa75de2f06331cd78dd48 (diff) | |
| parent | 3f22e529644aad8e4b763564c9ef98a3cbdae4fc (diff) | |
| download | podman-18da5b0bf6d83e31a3db534068af367816349cf0.tar.gz podman-18da5b0bf6d83e31a3db534068af367816349cf0.tar.bz2 podman-18da5b0bf6d83e31a3db534068af367816349cf0.zip | |
Merge pull request #11208 from ashley-cui/streams
[NO TESTS NEEDED] Allow setting of machine stream and image path from containers.conf
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/machine/init.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index f4133dbde..ac0d06a07 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -34,6 +34,7 @@ func init() { Parent: machineCmd, }) flags := initCmd.Flags() + cfg := registry.PodmanConfig() cpusFlagName := "cpus" flags.Uint64Var( @@ -61,7 +62,7 @@ func init() { _ = initCmd.RegisterFlagCompletionFunc(memoryFlagName, completion.AutocompleteNone) ImagePathFlagName := "image-path" - flags.StringVar(&initOpts.ImagePath, ImagePathFlagName, "", "Path to qcow image") + flags.StringVar(&initOpts.ImagePath, ImagePathFlagName, cfg.Engine.MachineImage, "Path to qcow image") _ = initCmd.RegisterFlagCompletionFunc(ImagePathFlagName, completion.AutocompleteDefault) IgnitionPathFlagName := "ignition-path" |