From 958782c7376f0782be0f36f4d94386f081e40b7e Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Fri, 9 Apr 2021 18:42:21 -0700 Subject: [PATCH] cmd/{tailscale,tailscaled}: use netstack for subnet routing on Synology Updates #707 Fixes #451 Fixes tailscale/tailscale-synology#52 (just make it work by default) Signed-off-by: Brad Fitzpatrick --- cmd/tailscale/cli/up.go | 3 --- cmd/tailscaled/tailscaled.go | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/tailscale/cli/up.go b/cmd/tailscale/cli/up.go index a59c5ec6e..d6a78628f 100644 --- a/cmd/tailscale/cli/up.go +++ b/cmd/tailscale/cli/up.go @@ -100,9 +100,6 @@ func runUp(ctx context.Context, args []string) error { if distro.Get() == distro.Synology { notSupported := "not yet supported on Synology; see https://github.com/tailscale/tailscale/issues/451" - if upArgs.advertiseRoutes != "" { - return errors.New("--advertise-routes is " + notSupported) - } if upArgs.acceptRoutes { return errors.New("--accept-routes is " + notSupported) } diff --git a/cmd/tailscaled/tailscaled.go b/cmd/tailscaled/tailscaled.go index 91edab654..e55bcedcb 100644 --- a/cmd/tailscaled/tailscaled.go +++ b/cmd/tailscaled/tailscaled.go @@ -335,6 +335,9 @@ func shouldWrapNetstack() bool { } return v } + if distro.Get() == distro.Synology { + return true + } switch runtime.GOOS { case "windows", "darwin": // Enable on Windows and tailscaled-on-macOS (this doesn't