diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-22 17:28:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 17:28:51 -0400 |
| commit | 20587dfb7d26781aaa31b11c984f7dec8e79a282 (patch) | |
| tree | 2d73cb0826c0d799bd51f3b07dcc22bb94592572 | |
| parent | f93500810800e85af4de88b99efeaea989db9025 (diff) | |
| parent | 3bd3c62134f76397a96505e2cfb465aad5efd221 (diff) | |
| download | podman-20587dfb7d26781aaa31b11c984f7dec8e79a282.tar.gz podman-20587dfb7d26781aaa31b11c984f7dec8e79a282.tar.bz2 podman-20587dfb7d26781aaa31b11c984f7dec8e79a282.zip | |
Merge pull request #11700 from ashley-cui/3.4stream
[3.4] Fix machine image
| -rw-r--r-- | docs/source/markdown/podman-machine-init.1.md | 2 | ||||
| -rw-r--r-- | pkg/machine/fcos.go | 2 | ||||
| -rw-r--r-- | pkg/machine/qemu/machine.go | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/docs/source/markdown/podman-machine-init.1.md b/docs/source/markdown/podman-machine-init.1.md index c864a87ef..8a65be5a9 100644 --- a/docs/source/markdown/podman-machine-init.1.md +++ b/docs/source/markdown/podman-machine-init.1.md @@ -40,7 +40,7 @@ do these things manually or handle otherwise. #### **--image-path** Fully qualified path or URL to the VM image. -Can also be set to `testing` or `stable` to pull down default image. +Can also be set to `testing`, `next`, or `stable` to pull down default image. Defaults to `testing`. #### **--memory**, **-m**=*number* diff --git a/pkg/machine/fcos.go b/pkg/machine/fcos.go index cfcadeb02..99197ac0e 100644 --- a/pkg/machine/fcos.go +++ b/pkg/machine/fcos.go @@ -139,6 +139,8 @@ func getFCOSDownload(imageStream string) (*fcosDownloadInfo, error) { ) switch imageStream { case "testing", "": + streamType = fedoracoreos.StreamTesting + case "next": streamType = fedoracoreos.StreamNext case "stable": streamType = fedoracoreos.StreamStable diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index d5f538594..b9b66c123 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -140,7 +140,7 @@ func (v *MachineVM) Init(opts machine.InitOptions) error { v.IdentityPath = filepath.Join(sshDir, v.Name) switch opts.ImagePath { - case "testing", "stable", "": + case "testing", "next", "stable", "": // Get image as usual dd, err := machine.NewFcosDownloader(vmtype, v.Name, opts.ImagePath) if err != nil { |