containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11701 from ashley-cui/stream 

Fix machine image
This commit is contained in:
OpenShift Merge Robot 2021-09-22 18:44:47 -04:00 committed by GitHub
parent f2eb5bbbae f5f95d722f
commit f342784ce5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/markdown/podman-machine-init.1.md
View File

@ -40,7 +40,7 @@ do these things manually or handle otherwise.
#### **--image-path** #### **--image-path**
Fully qualified path or URL to the VM image. 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`. Defaults to `testing`.
#### **--memory**, **-m**=*number* #### **--memory**, **-m**=*number*

2
pkg/machine/fcos.go
View File

@ -139,6 +139,8 @@ func getFCOSDownload(imageStream string) (*fcosDownloadInfo, error) {
) )
switch imageStream { switch imageStream {
case "testing", "": case "testing", "":
streamType = fedoracoreos.StreamTesting
case "next":
streamType = fedoracoreos.StreamNext streamType = fedoracoreos.StreamNext
case "stable": case "stable":
streamType = fedoracoreos.StreamStable streamType = fedoracoreos.StreamStable

2
pkg/machine/qemu/machine.go
View File

@ -140,7 +140,7 @@ func (v *MachineVM) Init(opts machine.InitOptions) error {
v.IdentityPath = filepath.Join(sshDir, v.Name) v.IdentityPath = filepath.Join(sshDir, v.Name)
switch opts.ImagePath { switch opts.ImagePath {
case "testing", "stable", "": case "testing", "next", "stable", "":
// Get image as usual // Get image as usual
dd, err := machine.NewFcosDownloader(vmtype, v.Name, opts.ImagePath) dd, err := machine.NewFcosDownloader(vmtype, v.Name, opts.ImagePath)
if err != nil { if err != nil {