diff options
| author | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2021-10-25 19:43:01 +0200 |
|---|---|---|
| committer | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2021-10-26 21:58:39 +0200 |
| commit | 864748df5be076a1456dfad07ecf62183e2f155e (patch) | |
| tree | 4024a9f1f76adcccd95b08b3844df427f8aba872 /pkg | |
| parent | 22e5dc19b01e813ff73f4a5be2df9c4adf795fd2 (diff) | |
| download | podman-864748df5be076a1456dfad07ecf62183e2f155e.tar.gz podman-864748df5be076a1456dfad07ecf62183e2f155e.tar.bz2 podman-864748df5be076a1456dfad07ecf62183e2f155e.zip | |
Record the image stream along with the path
[NO TESTS NEEDED]
Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/machine/config.go | 1 | ||||
| -rw-r--r-- | pkg/machine/qemu/config.go | 2 | ||||
| -rw-r--r-- | pkg/machine/qemu/machine.go | 3 |
3 files changed, 6 insertions, 0 deletions
diff --git a/pkg/machine/config.go b/pkg/machine/config.go index 3ff5c7fe7..55d5dd7b4 100644 --- a/pkg/machine/config.go +++ b/pkg/machine/config.go @@ -57,6 +57,7 @@ type ListResponse struct { CreatedAt time.Time LastUp time.Time Running bool + Stream string VMType string CPUs uint64 Memory uint64 diff --git a/pkg/machine/qemu/config.go b/pkg/machine/qemu/config.go index 9f5f45b58..c04773450 100644 --- a/pkg/machine/qemu/config.go +++ b/pkg/machine/qemu/config.go @@ -13,6 +13,8 @@ type MachineVM struct { IdentityPath string // IgnitionFilePath is the fq path to the .ign file IgnitionFilePath string + // ImageStream is the update stream for the image + ImageStream string // ImagePath is the fq path to ImagePath string // Memory in megabytes assigned to the vm diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 727b3cda4..4d8242e39 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -143,6 +143,7 @@ func (v *MachineVM) Init(opts machine.InitOptions) error { switch opts.ImagePath { case "testing", "next", "stable", "": // Get image as usual + v.ImageStream = opts.ImagePath dd, err := machine.NewFcosDownloader(vmtype, v.Name, opts.ImagePath) if err != nil { return err @@ -154,6 +155,7 @@ func (v *MachineVM) Init(opts machine.InitOptions) error { default: // The user has provided an alternate image which can be a file path // or URL. + v.ImageStream = "custom" g, err := machine.NewGenericDownloader(vmtype, v.Name, opts.ImagePath) if err != nil { return err @@ -595,6 +597,7 @@ func GetVMInfos() ([]*machine.ListResponse, error) { listEntry := new(machine.ListResponse) listEntry.Name = vm.Name + listEntry.Stream = vm.ImageStream listEntry.VMType = "qemu" listEntry.CPUs = vm.CPUs listEntry.Memory = vm.Memory |