TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-07-31 16:23:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: only exit silently if len(args) == 0 [gokrazy]

Browse Source 
This amends commit b7e48058c8d243adf1ff687e3e92d3fb02b035ea.

That commit broke all documented ways of starting Tailscale on gokrazy:
https://gokrazy.org/packages/tailscale/ — both Option A (tailscale up)
and Option B (tailscale up --auth-key) rely on the tailscale CLI working.

I verified that the tailscale CLI just prints it help when started
without arguments, i.e. it does not stay running and is not restarted.

I verified that the tailscale CLI successfully exits when started with
tailscale up --auth-key, regardless of whether the node has joined
the tailnet yet or not.

I verified that the tailscale CLI successfully waits and exits when
started with tailscale up, as expected.

fixes https://github.com/gokrazy/gokrazy/issues/286

Change-Id: Ie18ebd08022cae82564389e9e80732ad30eb308a
Signed-off-by: Michael Stapelberg <michael@stapelberg.de>
(cherry picked from commit 64ab0ddff14cfcae55b66017ba104afd3640e422)
This commit is contained in:
Michael Stapelberg 2025-01-12 09:57:38 +01:00 committed by Brad Fitzpatrick
parent 1b41fdeddb
commit 62656fdb1e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/tailscale/cli/cli.go
View File

@ -84,9 +84,9 @@ var localClient = tailscale.LocalClient{
// Run runs the CLI. The args do not include the binary name. // Run runs the CLI. The args do not include the binary name.
func Run(args []string) (err error) { func Run(args []string) (err error) {
if runtime.GOOS == "linux" && os.Getenv("GOKRAZY_FIRST_START") == "1" && distro.Get() == distro.Gokrazy && os.Getppid() == 1 { if runtime.GOOS == "linux" && os.Getenv("GOKRAZY_FIRST_START") == "1" && distro.Get() == distro.Gokrazy && os.Getppid() == 1 && len(args) == 0 {
// We're running on gokrazy and it's the first start. // We're running on gokrazy and the user did not specify 'up'.
// Don't run the tailscale CLI as a service; just exit. // Don't run the tailscale CLI and spam logs with usage; just exit.
// See https://gokrazy.org/development/process-interface/ // See https://gokrazy.org/development/process-interface/
os.Exit(0) os.Exit(0)
} }