opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 16:47:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

machine refactoring preparations for hyperv

Browse Source 
before we can support hyperv as a virtualization option for podman
machine, several areas in machine will require cleanup.  this is the
first pass of these changes to keep the review burden low.  changes
include:

  * convert artifact, format (image format) and compression to enums
    with string methods
  * rename Provider interface to VirtProvider
  * change Provider implementation in QEMU to QEMUVirt
  * change Provider implementation in WSL to WSLVirt

as mentioned earlier, there will be several more of these refactoring
PRs because assumptions were made about associations of platforms and
virt providers as well as compression and image formats.

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2023-02-20 10:40:13 -06:00
parent a9ec6492e8
commit ebb45b5bdd
12 changed files with 250 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/machine/pull.go
View File

@ -86,19 +86,9 @@ func supportedURL(path string) (url *url2.URL) {
}
func (d Download) GetLocalUncompressedFile(dataDir string) string {
var (
extension string
)
switch {
case strings.HasSuffix(d.LocalPath, ".bz2"):
extension = ".bz2"
case strings.HasSuffix(d.LocalPath, ".gz"):
extension = ".gz"
case strings.HasSuffix(d.LocalPath, ".xz"):
extension = ".xz"
}
extension := compressionFromFile(dataDir)
uncompressedFilename := d.VMName + "_" + d.ImageName
return filepath.Join(dataDir, strings.TrimSuffix(uncompressedFilename, extension))
return filepath.Join(dataDir, strings.TrimSuffix(uncompressedFilename, extension.String()))
}
func (g GenericDownload) Get() *Download {
@ -224,11 +214,11 @@ func Decompress(localPath, uncompressedPath string) error {
// Will error out if file without .xz already exists
// Maybe extracting then renaming is a good idea here..
// depends on xz: not pre-installed on mac, so it becomes a brew dependency
// depends on Xz: not pre-installed on mac, so it becomes a brew dependency
func decompressXZ(src string, output io.WriteCloser) error {
var read io.Reader
var cmd *exec.Cmd
// Prefer xz utils for fastest performance, fallback to go xi2 impl
// Prefer Xz utils for fastest performance, fallback to go xi2 impl
if _, err := exec.LookPath("xz"); err == nil {
cmd = exec.Command("xz", "-d", "-c", "-k", src)
read, err = cmd.StdoutPipe()