From 7ee4e251e8e63094b58309dc48b370226342317e Mon Sep 17 00:00:00 2001 From: Adphi Date: Tue, 9 Aug 2022 18:30:01 +0200 Subject: [PATCH] d2vm/run: hetzner: do not use sparsecat if not on linux Signed-off-by: Adphi --- cmd/d2vm/run/hetzner.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/cmd/d2vm/run/hetzner.go b/cmd/d2vm/run/hetzner.go index 81757e1..4343a9c 100644 --- a/cmd/d2vm/run/hetzner.go +++ b/cmd/d2vm/run/hetzner.go @@ -22,6 +22,7 @@ import ( "net" "os" "os/exec" + "runtime" "time" "github.com/dustin/go-humanize" @@ -194,7 +195,13 @@ func runHetzner(ctx context.Context, imgPath string, stdin io.Reader, stderr io. logrus.Infof("writing image to %s", vmBlockPath) done := make(chan struct{}) defer close(done) - pr := newProgressReader(sparsecat.NewEncoder(src)) + var r io.Reader + if runtime.GOOS == "linux" { + r = sparsecat.NewEncoder(src) + } else { + r = src + } + pr := newProgressReader(r) wses.Stdin = pr go func() { tk := time.NewTicker(time.Second) @@ -203,7 +210,7 @@ func runHetzner(ctx context.Context, imgPath string, stdin io.Reader, stderr io. select { case <-tk.C: b := pr.Progress() - logrus.Infof("%s / %d%% transfered ( %s/s)", humanize.Bytes(uint64(b)), int(float64(b)/float64(i.VirtualSize)*100), humanize.Bytes(uint64(b-last))) + logrus.Infof("%s / %d%% transfered (%s/s)", humanize.Bytes(uint64(b)), int(float64(b)/float64(i.VirtualSize)*100), humanize.Bytes(uint64(b-last))) last = b case <-ctx.Done(): logrus.Warnf("context cancelled") @@ -214,7 +221,13 @@ func runHetzner(ctx context.Context, imgPath string, stdin io.Reader, stderr io. } } }() - if b, err := wses.CombinedOutput(fmt.Sprintf("%s -r -disable-sparse-target -of %s", sparsecatPath, vmBlockPath)); err != nil { + var cmd string + if runtime.GOOS == "linux" { + cmd = fmt.Sprintf("%s -r -disable-sparse-target -of %s", sparsecatPath, vmBlockPath) + } else { + cmd = fmt.Sprintf("dd of=%s", vmBlockPath) + } + if b, err := wses.CombinedOutput(cmd); err != nil { return fmt.Errorf("%v: %s", err, string(b)) } return nil