opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-01 09:06:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow setting of machine stream and image path from containers.conf

Browse Source 
Default is "testing"

Signed-off-by: Ashley Cui <acui@redhat.com>
This commit is contained in:
Ashley Cui
2021-08-12 10:31:17 -04:00
parent 23f9565547
commit 3f22e52964
6 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,9 +138,20 @@ func (v *MachineVM) Init(opts machine.InitOptions) error {
jsonFile := filepath.Join(vmConfigDir, v.Name) + ".json"
v.IdentityPath = filepath.Join(sshDir, v.Name)
// The user has provided an alternate image which can be a file path
// or URL.
if len(opts.ImagePath) > 0 {
switch opts.ImagePath {
case "testing", "stable", "":
// Get image as usual
dd, err := machine.NewFcosDownloader(vmtype, v.Name, opts.ImagePath)
if err != nil {
return err
}
v.ImagePath = dd.Get().LocalUncompressedFile
if err := dd.DownloadImage(); err != nil {
return err
}
default:
// The user has provided an alternate image which can be a file path
// or URL.
g, err := machine.NewGenericDownloader(vmtype, v.Name, opts.ImagePath)
if err != nil {
return err
@ -149,18 +160,7 @@ func (v *MachineVM) Init(opts machine.InitOptions) error {
if err := g.DownloadImage(); err != nil {
return err
}
} else {
// Get the image as usual
dd, err := machine.NewFcosDownloader(vmtype, v.Name)
if err != nil {
return err
}
v.ImagePath = dd.Get().LocalUncompressedFile
if err := dd.DownloadImage(); err != nil {
return err
}
}
// Add arch specific options including image location
v.CmdLine = append(v.CmdLine, v.addArchOptions()...)