summaryrefslogtreecommitdiff
path: root/pkg/machine
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-22 18:44:47 -0400
committerGitHub <noreply@github.com>2021-09-22 18:44:47 -0400
commitf342784ce58fef0e79c61181e355f320d6f903da (patch)
tree340e835f8b8ea8e3c580ca7eeaf0b5bbc01a86b6 /pkg/machine
parentf2eb5bbbaee0f8dae0ee980280d1cdb526a81330 (diff)
parentf5f95d722fac04bbc2c5082ea430c9eb1f0eeade (diff)
downloadpodman-f342784ce58fef0e79c61181e355f320d6f903da.tar.gz
podman-f342784ce58fef0e79c61181e355f320d6f903da.tar.bz2
podman-f342784ce58fef0e79c61181e355f320d6f903da.zip
Merge pull request #11701 from ashley-cui/stream
Fix machine image
Diffstat (limited to 'pkg/machine')
-rw-r--r--pkg/machine/fcos.go2
-rw-r--r--pkg/machine/qemu/machine.go2
2 files changed, 3 insertions, 1 deletions
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 394177003..3b36985e3 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 {