From 358262869176bfddf369517994ac0337712f75e0 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sat, 14 Jan 2023 12:21:33 -0800 Subject: [PATCH] net/dns/resolvconffile: link to FAQ about resolv.conf being overwritten Add link to new http://tailscale.com/s/resolvconf-overwrite page, added in tailscale/tailscale-www#2243 Change-Id: I9718399487f2ed18bf1a112581fd168aea30f232 Signed-off-by: Brad Fitzpatrick --- net/dns/direct_test.go | 1 + net/dns/resolvconffile/resolvconffile.go | 1 + 2 files changed, 2 insertions(+) diff --git a/net/dns/direct_test.go b/net/dns/direct_test.go index 78dfd29e4..2c89debe5 100644 --- a/net/dns/direct_test.go +++ b/net/dns/direct_test.go @@ -88,6 +88,7 @@ func testDirect(t *testing.T, fs wholeFileFS) { t.Fatal(err) } want := `# resolv.conf(5) file generated by tailscale +# For more info, see http://tailscale.com/s/resolvconf-overwrite # DO NOT EDIT THIS FILE BY HAND -- CHANGES WILL BE OVERWRITTEN nameserver 8.8.8.8 diff --git a/net/dns/resolvconffile/resolvconffile.go b/net/dns/resolvconffile/resolvconffile.go index 6b9cf0452..f47056da4 100644 --- a/net/dns/resolvconffile/resolvconffile.go +++ b/net/dns/resolvconffile/resolvconffile.go @@ -42,6 +42,7 @@ type Config struct { func (c *Config) Write(w io.Writer) error { buf := new(bytes.Buffer) io.WriteString(buf, "# resolv.conf(5) file generated by tailscale\n") + io.WriteString(buf, "# For more info, see http://tailscale.com/s/resolvconf-overwrite\n") io.WriteString(buf, "# DO NOT EDIT THIS FILE BY HAND -- CHANGES WILL BE OVERWRITTEN\n\n") for _, ns := range c.Nameservers { io.WriteString(buf, "nameserver ")