linka-cloud/d2vm
2
0
Fork 0
mirror of https://github.com/linka-cloud/d2vm.git synced 2025-06-28 08:02:26 +00:00
Code Issues Releases Activity

run/vbox: move console to go.linka.cloud/console

Browse Source 
Signed-off-by: Adphi <philippe.adrien.nousse@gmail.com>
This commit is contained in:
Adphi
2022-09-09 21:13:33 +02:00
parent c923817c06
commit 13efc1a646
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/d2vm/run/vbox.go
View File

@ -13,10 +13,10 @@ import (
"strconv"
"strings"
"github.com/containerd/console"
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.linka.cloud/console"
exec2 "go.linka.cloud/d2vm/pkg/exec"
)
@ -236,6 +236,13 @@ func vbox(ctx context.Context, path string) error {
if err != nil {
return fmt.Errorf("get term size: %v", err)
}
_, out, err = manage(vboxmanage, "startvm", name, "--type", vmType)
if err != nil {
return fmt.Errorf("startvm error: %v\n%s", err, out)
}
defer cleanup(vboxmanage, name)
if err := term.Resize(ws); err != nil {
return fmt.Errorf("resize term: %v", err)
}
@ -246,17 +253,8 @@ func vbox(ctx context.Context, path string) error {
if err := term.Reset(); err != nil {
log.Errorf("failed to reset term: %v", err)
}
if err := term.Close(); err != nil {
log.Errorf("failed to close term: %v", err)
}
}()
_, out, err = manage(vboxmanage, "startvm", name, "--type", vmType)
if err != nil {
return fmt.Errorf("startvm error: %v\n%s", err, out)
}
defer cleanup(vboxmanage, name)
socket, err := ln.Accept()
if err != nil {
return fmt.Errorf("Accept error: %v", err)