diff options
| author | David Crawshaw <crawshaw@tailscale.com> | 2021-03-30 09:21:22 -0700 |
|---|---|---|
| committer | David Crawshaw <crawshaw@tailscale.com> | 2021-03-30 09:23:08 -0700 |
| commit | 2cf0fdb76047d029ad7da944f58524776bd4f839 (patch) | |
| tree | 132959efa65575f1fd0c890526eed761fafc4e97 /cmd | |
| parent | 33bc69cf1f7a026221368c1cebbbdcee66529a80 (diff) | |
| download | tailscale-crawshaw/socket.tar.xz tailscale-crawshaw/socket.zip | |
client/tailscale, cmd/tailscale/cli: plumb --socket throughcrawshaw/socket
Without this, `tailscale status` ignores the --socket flag on macOS and
always talks to the IPNExtension, even if you wanted it to inspect a
userspace tailscaled.
Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/tailscale/cli/cli.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/tailscale/cli/cli.go b/cmd/tailscale/cli/cli.go index daabb3eed..b9d01522f 100644 --- a/cmd/tailscale/cli/cli.go +++ b/cmd/tailscale/cli/cli.go @@ -20,6 +20,7 @@ import ( "text/tabwriter" "github.com/peterbourgon/ff/v2/ffcli" + "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/paths" "tailscale.com/safesocket" @@ -88,6 +89,8 @@ change in the future. return err } + tailscale.TailscaledSocket = rootArgs.socket + err := rootCmd.Run(context.Background()) if err == flag.ErrHelp { return nil |