From 97635f7cb65a03b2423970f417fbc9dc7fd77cf7 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sun, 21 Aug 2022 22:29:43 -0500 Subject: [PATCH] Fix resolv.conf detection - Apply upstream change Nyr/openvpn-install commit d28c8e7. - Some systems have other DNS servers along with 127.0.0.53 in /etc/resolv.conf. --- openvpn-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index f9d7dc5..8220e13 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -344,13 +344,13 @@ server 10.8.0.0 255.255.255.0" > /etc/openvpn/server/server.conf 1|"") # Locate the proper resolv.conf # Needed for systems running systemd-resolved - if grep -q '^nameserver 127.0.0.53' "/etc/resolv.conf"; then - resolv_conf="/run/systemd/resolve/resolv.conf" - else + if grep '^nameserver' "/etc/resolv.conf" | grep -qv '127.0.0.53' ; then resolv_conf="/etc/resolv.conf" + else + resolv_conf="/run/systemd/resolve/resolv.conf" fi # Obtain the resolvers from resolv.conf and use them for OpenVPN - grep -v '^#\|^;' "$resolv_conf" | grep '^nameserver' | grep -oE '[0-9]{1,3}(\.[0-9]{1,3}){3}' | while read line; do + grep -v '^#\|^;' "$resolv_conf" | grep '^nameserver' | grep -v '127.0.0.53' | grep -oE '[0-9]{1,3}(\.[0-9]{1,3}){3}' | while read line; do echo "push \"dhcp-option DNS $line\"" >> /etc/openvpn/server/server.conf done ;;