linka-cloud/d2vm
2
0
Fork 0
mirror of https://github.com/linka-cloud/d2vm.git synced 2024-12-01 11:56:24 +00:00
Code Issues Releases Activity

d2vm/run: hetzner: do not use sparsecat if not on linux

Browse Source 
Signed-off-by: Adphi <philippe.adrien.nousse@gmail.com>
This commit is contained in:
Adphi 2022-08-09 18:30:01 +02:00
parent dec8c08db0
commit 20686be390
Signed by: adphi
GPG Key ID: 46BE4062DB2397FF
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/d2vm/run/hetzner.go
View File

@ -22,6 +22,7 @@ import (
"net" "net"
"os" "os"
"os/exec" "os/exec"
"runtime"
"time" "time"
"github.com/dustin/go-humanize" "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) logrus.Infof("writing image to %s", vmBlockPath)
done := make(chan struct{}) done := make(chan struct{})
defer close(done) 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 wses.Stdin = pr
go func() { go func() {
tk := time.NewTicker(time.Second) tk := time.NewTicker(time.Second)
@ -203,7 +210,7 @@ func runHetzner(ctx context.Context, imgPath string, stdin io.Reader, stderr io.
select { select {
case <-tk.C: case <-tk.C:
b := pr.Progress() 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 last = b
case <-ctx.Done(): case <-ctx.Done():
logrus.Warnf("context cancelled") 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 fmt.Errorf("%v: %s", err, string(b))
} }
return nil return nil