From a39d2403bcaf84557d8040831b6aad7b513a411b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 2 Apr 2021 02:25:37 -0700 Subject: [PATCH] net/dns: disable NetworkManager and resolved configurators temporarily. They need some rework to do the right thing, in the meantime the direct and resolvconf managers will work out. The resolved implementation was never selected due to control-side settings. The networkmanager implementation mostly doesn't get selected due to unforeseen interactions with `resolvconf` on many platforms. Both implementations also need rework to support the various routing modes they're capable of. Signed-off-by: David Anderson --- net/dns/manager_linux.go | 9 +++++---- net/dns/nm.go | 2 ++ net/dns/resolved.go | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/net/dns/manager_linux.go b/net/dns/manager_linux.go index c1517c3c9..95ef9b906 100644 --- a/net/dns/manager_linux.go +++ b/net/dns/manager_linux.go @@ -8,10 +8,11 @@ import "tailscale.com/types/logger" func newManager(logf logger.Logf, interfaceName string) OSConfigurator { switch { - case isResolvedActive(): - return newResolvedManager() - case isNMActive(): - return newNMManager(interfaceName) + // TODO: rework NetworkManager and resolved support. + // case isResolvedActive(): + // return newResolvedManager() + // case isNMActive(): + // return newNMManager(interfaceName) case isResolvconfActive(): return newResolvconfManager(logf) default: diff --git a/net/dns/nm.go b/net/dns/nm.go index e5f8601ee..a2342a9ba 100644 --- a/net/dns/nm.go +++ b/net/dns/nm.go @@ -4,6 +4,8 @@ // +build linux +//lint:file-ignore U1000 refactoring, temporarily unused code. + package dns import ( diff --git a/net/dns/resolved.go b/net/dns/resolved.go index e478c6af1..b2990bb98 100644 --- a/net/dns/resolved.go +++ b/net/dns/resolved.go @@ -4,6 +4,8 @@ // +build linux +//lint:file-ignore U1000 refactoring, temporarily unused code. + package dns import (