Merge pull request #11700 from ashley-cui/3.4stream

[3.4] Fix machine image
containers · Sep 22, 2021 · 20587df · 20587df
2 parents f935008 + 3bd3c62
commit 20587df
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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 {