Windows is the worst OS ever
This commit is contained in:
parent
41d8cb42c9
commit
c31f193096
3 changed files with 8 additions and 2 deletions
|
|
@ -136,7 +136,7 @@ func (fm *FileManager) luksOpen(sc *ssh.Client, fullDevPath string) error {
|
||||||
err = sess.Wait()
|
err = sess.Wait()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if strings.Contains(stderrBuf.String(), "Not enough available memory to open a keyslot.") {
|
if strings.Contains(stderrBuf.String(), "Not enough available memory to open a keyslot.") {
|
||||||
fm.logger.Warn("Detected not enough memory to open a LUKS device, please allocate more memory using --vm-mem-alloc flag.")
|
fm.logger.Warn("Detected not enough memory to open a LUKS device, please allocate more memory using --vm-mem-alloc flag")
|
||||||
}
|
}
|
||||||
|
|
||||||
return utils.WrapErrWithLog(err, "wait for cryptsetup luksopen cmd to finish", stderrBuf.String())
|
return utils.WrapErrWithLog(err, "wait for cryptsetup luksopen cmd to finish", stderrBuf.String())
|
||||||
|
|
|
||||||
|
|
@ -18,3 +18,8 @@ func prepareVMCmd(cmd *exec.Cmd) {
|
||||||
func terminateProcess(pid int) error {
|
func terminateProcess(pid int) error {
|
||||||
return exec.Command("TASKKILL", "/T", "/F", "/PID", fmt.Sprint(pid)).Run()
|
return exec.Command("TASKKILL", "/T", "/F", "/PID", fmt.Sprint(pid)).Run()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func checkDeviceSeemsMounted(path string) (bool, error) {
|
||||||
|
// We do not have mount checks on Windows.
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
|
||||||
3
vm/vm.go
3
vm/vm.go
|
|
@ -11,6 +11,7 @@ import (
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
|
|
@ -163,7 +164,7 @@ func NewVM(logger *slog.Logger, cfg VMConfig) (*VM, error) {
|
||||||
return nil, errors.Wrapf(err, "stat extra drive #%v path", i)
|
return nil, errors.Wrapf(err, "stat extra drive #%v path", i)
|
||||||
}
|
}
|
||||||
|
|
||||||
driveArgs := "file=" + shellescape.Quote(extraDrive.Path) + ",format=qcow2,if=none,id=disk" + fmt.Sprint(i)
|
driveArgs := "file=" + shellescape.Quote(strings.ReplaceAll(extraDrive.Path, "\\", "/")) + ",format=qcow2,if=none,id=disk" + fmt.Sprint(i)
|
||||||
if extraDrive.SnapshotMode {
|
if extraDrive.SnapshotMode {
|
||||||
driveArgs += ",snapshot=on"
|
driveArgs += ",snapshot=on"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue