TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-08 05:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/dns: remove systemd-resolved ping

Browse Source 
Ping only needed to ensure system awak otherwise utilizing resolvConf to set dns mode.

Signed-off-by: nyghtowl <warrick@tailscale.com>
This commit is contained in:
nyghtowl
2022-07-25 20:20:48 +00:00
committed by Melanie Warrick
parent 617a2ec7cc
commit e6e1976c3a
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/dns/manager_linux.go
View File

@@ -112,10 +112,6 @@ func dnsMode(logf logger.Logf, env newOSConfigEnv) (ret string, err error) {
dbg("resolved", "not-in-use")
return "direct", nil
}
if !resolvedUp {
dbg("resolved", "no")
return "direct", nil
}
if err := env.dbusPing("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager/DnsManager"); err != nil {
dbg("nm", "no")
return "systemd-resolved", nil
@@ -217,11 +213,6 @@ func dnsMode(logf logger.Logf, env newOSConfigEnv) (ret string, err error) {
}
dbg("nm-resolved", "yes")
if !resolvedUp {
dbg("resolved", "no")
return "direct", nil
}
// See large comment above for reasons we'd use NM rather than
// resolved. systemd-resolved is actually in charge of DNS
// configuration, but in some cases we might need to configure