Skip to content

Commit 1c430a4

Browse files
authored
Merge pull request #16934 from sethrylan/fix-16933
Add mkdir for `~/.ssh` directory.
2 parents 8cdc5c7 + 2587f3f commit 1c430a4

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

Diff for: cmd/minikube/cmd/ssh-host.go

+11-2
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,16 @@ func appendKnownHelper(nodeName string, appendKnown bool) {
8888
if port != 22 {
8989
host = fmt.Sprintf("[%s]:%d", addr, port)
9090
}
91-
knownHosts := filepath.Join(homedir.HomeDir(), ".ssh", "known_hosts")
9291

93-
fmt.Fprintf(os.Stderr, "Host added: %s (%s)\n", knownHosts, host)
92+
sshDir := filepath.Join(homedir.HomeDir(), ".ssh")
93+
err = os.MkdirAll(sshDir, os.FileMode(0700)) // drwx------, to match ssh-keygen behavior
94+
if err != nil {
95+
out.ErrLn("MkdirAll: %v", err)
96+
os.Exit(1)
97+
}
98+
99+
knownHosts := filepath.Join(sshDir, "known_hosts")
100+
94101
if sshutil.KnownHost(host, knownHosts) {
95102
return
96103
}
@@ -113,6 +120,8 @@ func appendKnownHelper(nodeName string, appendKnown bool) {
113120
os.Exit(1)
114121
}
115122

123+
fmt.Fprintf(os.Stderr, "Host added: %s (%s)\n", knownHosts, host)
124+
116125
return
117126
}
118127
}

0 commit comments

Comments
 (0)