TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-27 10:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/dns: also include 'tail' and 'base' files when fixing up resolv.conf.

Browse Source 
Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2021-04-10 23:01:11 -07:00
parent e43afe9140
commit 9831f1b183
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/dns/resolvconf-workaround.sh
View File

@ -46,6 +46,14 @@ fi
fi fi
echo "# Tailscale workaround applied to set exclusive DNS configuration." echo "# Tailscale workaround applied to set exclusive DNS configuration."
cat tun-tailscale.inet cat tun-tailscale.inet
if [ -f /etc/resolvconf/resolv.conf.d/base ]; then
# Keep options and sortlist, discard other base things since
# they're the things we're trying to override.
grep -e 'sortlist ' -e 'options ' /etc/resolvconf/resolv.conf.d/base || true
fi
if [ -f /etc/resolvconf/resolv.conf.d/tail ]; then
cat /etc/resolvconf/resolv.conf.d/tail
fi
) >/etc/resolv.conf ) >/etc/resolv.conf
if [ -d /etc/resolvconf/update-libc.d ] ; then if [ -d /etc/resolvconf/update-libc.d ] ; then