diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2019-02-22 18:39:54 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-02-22 18:39:54 +0100 |
| commit | b198b1edefd4e3890810717b72b12ddb2d612963 (patch) | |
| tree | 619f3fd2c34a6a4f1f4b021cf0bd0314086a102d /vm/vmimpl | |
| parent | 1c2f03dc0d9fbb5ccb1c3ec28a37583ccdf0d893 (diff) | |
vm/vmimpl: don't pass ssh key twice
Diffstat (limited to 'vm/vmimpl')
| -rw-r--r-- | vm/vmimpl/util.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vm/vmimpl/util.go b/vm/vmimpl/util.go index 1df9f4359..c7462c2cf 100644 --- a/vm/vmimpl/util.go +++ b/vm/vmimpl/util.go @@ -41,6 +41,9 @@ func WaitForSSH(debug bool, timeout time.Duration, addr, sshKey, sshUser, OS str if err == nil { return nil } + if debug { + log.Logf(0, "ssh failed: %v", err) + } if time.Since(startTime) > timeout { return &osutil.VerboseError{Title: "can't ssh into the instance", Output: []byte(err.Error())} } @@ -58,7 +61,6 @@ func SCPArgs(debug bool, sshKey string, port int) []string { func sshArgs(debug bool, sshKey, portArg string, port int) []string { args := []string{ portArg, fmt.Sprint(port), - "-i", sshKey, "-F", "/dev/null", "-o", "UserKnownHostsFile=/dev/null", "-o", "BatchMode=yes", |