TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-19 05:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/dns/resolvconffile: link to FAQ about resolv.conf being overwritten

Browse Source 
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 <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2023-01-14 12:21:33 -08:00 committed by Brad Fitzpatrick
parent 3a018e51bb
commit 3582628691
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/dns/direct_test.go
View File

@ -88,6 +88,7 @@ func testDirect(t *testing.T, fs wholeFileFS) {
t.Fatal(err) t.Fatal(err)
} }
want := `# resolv.conf(5) file generated by tailscale 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 # DO NOT EDIT THIS FILE BY HAND -- CHANGES WILL BE OVERWRITTEN
nameserver 8.8.8.8 nameserver 8.8.8.8

1
net/dns/resolvconffile/resolvconffile.go
View File

@ -42,6 +42,7 @@ type Config struct {
func (c *Config) Write(w io.Writer) error { func (c *Config) Write(w io.Writer) error {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
io.WriteString(buf, "# resolv.conf(5) file generated by tailscale\n") 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") io.WriteString(buf, "# DO NOT EDIT THIS FILE BY HAND -- CHANGES WILL BE OVERWRITTEN\n\n")
for _, ns := range c.Nameservers { for _, ns := range c.Nameservers {
io.WriteString(buf, "nameserver ") io.WriteString(buf, "nameserver ")