From eee6b85b9b36341dc36937aa0bb4ca317be06e2d Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Thu, 5 Aug 2021 15:38:38 -0700 Subject: [PATCH] cmd/tailscaled: don't require root for --cleanup Without this, the integration tests fail locally for me: --- FAIL: TestCollectPanic (7.61s) integration.go:74: built [tailscale.com/cmd/tailscaled tailscale.com/cmd/tailscale] in 1.59s integration_test.go:102: initial run: tailscaled requires root; use sudo tailscaled (or use --tun=userspace-networking) integration_test.go:108: cleanup failed: exit status 1: "tailscaled requires root; use sudo tailscaled (or use --tun=userspace-networking)\n" stuntest.go:64: STUN server shutdown FAIL FAIL tailscale.com/tstest/integration 9.678s FAIL Signed-off-by: Josh Bleecher Snyder --- cmd/tailscaled/tailscaled.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/tailscaled/tailscaled.go b/cmd/tailscaled/tailscaled.go index 005a64439..de3664bba 100644 --- a/cmd/tailscaled/tailscaled.go +++ b/cmd/tailscaled/tailscaled.go @@ -142,7 +142,7 @@ func main() { os.Exit(0) } - if runtime.GOOS == "darwin" && os.Getuid() != 0 && !strings.Contains(args.tunname, "userspace-networking") { + if runtime.GOOS == "darwin" && os.Getuid() != 0 && !strings.Contains(args.tunname, "userspace-networking") && !args.cleanup { log.SetFlags(0) log.Fatalf("tailscaled requires root; use sudo tailscaled (or use --tun=userspace-networking)") }