TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-06-12 02:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale: make ssh command work when tailscaled is built with the ts_include_cli tag

Browse Source 
Fixes #12125

Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
This commit is contained in:
Sandro Jäckel 2024-05-12 22:57:10 +02:00 committed by Percy Wegmann
parent 83808029d8
commit 08a96a86af
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/tailscale/cli/ssh.go
View File

@ -84,10 +84,6 @@ func runSSH(ctx context.Context, args []string) error {
// of failing. But for now: // of failing. But for now:
return fmt.Errorf("no system 'ssh' command found: %w", err) return fmt.Errorf("no system 'ssh' command found: %w", err)
} }
tailscaleBin, err := os.Executable()
if err != nil {
return err
}
knownHostsFile, err := writeKnownHosts(st) knownHostsFile, err := writeKnownHosts(st)
if err != nil { if err != nil {
return err return err
@ -116,7 +112,9 @@ func runSSH(ctx context.Context, args []string) error {
argv = append(argv, argv = append(argv,
"-o", fmt.Sprintf("ProxyCommand %q %s nc %%h %%p", "-o", fmt.Sprintf("ProxyCommand %q %s nc %%h %%p",
tailscaleBin, // os.Executable() would return the real running binary but in case tailscale is built with the ts_include_cli tag,
// we need to return the started symlink instead
os.Args[0],
socketArg, socketArg,
)) ))
} }