forks/linsk
forks/linsk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore working state

Browse source
This commit is contained in:
AlexSSD7 2023-08-27 15:53:44 +01:00
commit 3cbe45c420
7 changed files with 55 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
vm/ssh.go
View file

@ -121,7 +121,7 @@ func (vm *VM) sshSetup() (ssh.Signer, error) {
case <-vm.ctx.Done():
return nil, vm.ctx.Err()
case <-time.After(time.Until(deadline)):
return nil, fmt.Errorf("setup command timed out %v", getLogErrMsg(stdOutErrBuf.String()))
return nil, fmt.Errorf("setup command timed out %v", utils.GetLogErrMsg(stdOutErrBuf.String()))
case data := <-vm.serialStdoutCh:
prefix := []byte("SERIAL STATUS: ")
stdOutErrBuf.WriteString(utils.ClearUnprintableChars(string(data), true))
@ -132,7 +132,7 @@ func (vm *VM) sshSetup() (ssh.Signer, error) {
if data[len(prefix)] != '0' {
fmt.Fprintf(os.Stderr, "SSH SETUP FAILURE:\n%v", stdOutErrBuf.String())
return nil, fmt.Errorf("non-zero setup command status code: '%v' %v", string(data[len(prefix)]), getLogErrMsg(stdOutErrBuf.String()))
return nil, fmt.Errorf("non-zero setup command status code: '%v' %v", string(data[len(prefix)]), utils.GetLogErrMsg(stdOutErrBuf.String()))
}
return sshSigner, nil
@ -173,7 +173,7 @@ func runSSHCmd(c *ssh.Client, cmd string) ([]byte, error) {
err = sess.Run(cmd)
if err != nil {
return nil, wrapErrWithLog(err, "run cmd", stderr.String())
return nil, utils.WrapErrWithLog(err, "run cmd", stderr.String())
}
return stdout.Bytes(), nil