From 85d93fc4e3d9d1c6f41ee461e059715738941863 Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Thu, 28 May 2020 04:47:10 -0400 Subject: [PATCH] cmd/tailscale: make ip_forward warnings more actionable. Let's actually list the file we checked (/proc/sys/net/ipv4/ip_forward). That gives the admin something specific to look for when they get this message. Signed-off-by: Avery Pennarun --- cmd/tailscale/tailscale.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/tailscale/tailscale.go b/cmd/tailscale/tailscale.go index 92556fbb2..34a225997 100644 --- a/cmd/tailscale/tailscale.go +++ b/cmd/tailscale/tailscale.go @@ -152,16 +152,16 @@ func checkIPForwarding() { } bs, err := ioutil.ReadFile("/proc/sys/net/ipv4/ip_forward") if err != nil { - warning("couldn't check if IP forwarding is enabled (%v). IP forwarding must be enabled for subnet routes to work.", err) + warning("couldn't check /proc/sys/net/ipv4/ip_forward (%v).\nSubnet routes won't work without IP forwarding.", err) return } on, err := strconv.ParseBool(string(bytes.TrimSpace(bs))) if err != nil { - warning("couldn't check if IP forwarding is enabled (%v). IP forwarding must be enabled for subnet routes to work.", err) + warning("couldn't parse /proc/sys/net/ipv4/ip_forward (%v).\nSubnet routes won't work without IP forwarding.", err) return } if !on { - warning("IP forwarding is disabled, subnet routes will not work.") + warning("/proc/sys/net/ipv4/ip_forward is disabled. Subnet routes won't work.") } }