SVI/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-28 08:52:37 -04:00
Code Issues 3.0k Packages Projects Releases 10 Wiki Activity

Prefer systemd-resolved stub over file mode regardless of resolv.conf header

Browse Source
This commit is contained in:
Viktor Liu
2026-04-21 06:29:24 +02:00
parent 3098f48b25
commit d5e9eb814e
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/internal/dns/host_unix.go
View File

@@ -75,6 +75,16 @@ func newHostManagerFromType(wgInterface string, osManager osManagerType) (restor
}
func getOSDNSManagerType() (osManagerType, error) {
// If systemd-resolved is serving on 127.0.0.53, prefer it regardless of
// who owns /etc/resolv.conf. NetworkManager often rewrites resolv.conf with
// its own header while still deferring resolution to systemd-resolved, and
// falling back to file mode there snapshots 127.0.0.53 as the fallback
// upstream. systemd-resolved in foreign mode re-reads /etc/resolv.conf and
// ingests our address as global DNS, which closes the loop.
if isSystemdResolvedRunning() && checkStub() {
return systemdManager, nil
}
file, err := os.Open(defaultResolvConfPath)
if err != nil {
return 0, fmt.Errorf("unable to open %s for checking owner, got error: %w", defaultResolvConfPath, err)
@@ -100,13 +110,6 @@ func getOSDNSManagerType() (osManagerType, error) {
if strings.Contains(text, "NetworkManager") && isDbusListenerRunning(networkManagerDest, networkManagerDbusObjectNode) && isNetworkManagerSupported() {
return networkManager, nil
}
if strings.Contains(text, "systemd-resolved") && isSystemdResolvedRunning() {
if checkStub() {
return systemdManager, nil
} else {
return fileManager, nil
}
}
if strings.Contains(text, "resolvconf") {
if isSystemdResolveConfMode() {
return systemdManager, nil