From e75742ca69924bbf351cb9d4a708b597e0510aa6 Mon Sep 17 00:00:00 2001 From: Balaji Vijayakumar Date: Thu, 14 Jul 2022 11:30:13 +0530 Subject: [PATCH] bug: honor arch while downloading disk --- pkg/vzrun/disk.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/vzrun/disk.go b/pkg/vzrun/disk.go index a864940..88be891 100644 --- a/pkg/vzrun/disk.go +++ b/pkg/vzrun/disk.go @@ -24,7 +24,12 @@ func EnsureDisk(ctx context.Context, cfg VM) error { if _, err := os.Stat(baseDisk); errors.Is(err, os.ErrNotExist) { var ensuredRequiredImages bool errs := make([]error, len(cfg.MacVZYaml.Images)) + resolveArch := yaml.ResolveArch() for i, f := range cfg.MacVZYaml.Images { + if f.Arch != resolveArch { + errs[i] = fmt.Errorf("image architecture %s didn't match system architecture: %s", f.Arch, resolveArch) + continue + } err := downloadImage(kernel, f.Kernel) if err != nil { errs[i] = fmt.Errorf("failed to download required images: %w", err) @@ -49,6 +54,7 @@ func EnsureDisk(ctx context.Context, cfg VM) error { err = iso9660util.Extract(BaseDiskZip, "focal-server-cloudimg-"+fileName+".img", baseDisk) if err != nil { errs[i] = fmt.Errorf("failed to extract base image: %w", err) + continue } ensuredRequiredImages = true