wbk/wireguard-install
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix resolv.conf detection

Browse source 
Some systems have other DNS servers along with 127.0.0.53 in /etc/resolv.conf
This commit is contained in:
Nyr 2022-08-21 20:35:42 +02:00
parent 5c53ebd312
commit 98f45f883c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wireguard-install.sh
View file

@ -110,13 +110,13 @@ new_client_dns () {
1|"") 1|"")
# Locate the proper resolv.conf # Locate the proper resolv.conf
# Needed for systems running systemd-resolved # Needed for systems running systemd-resolved
if grep -q '^nameserver 127.0.0.53' "/etc/resolv.conf"; then if grep '^nameserver' "/etc/resolv.conf" | grep -qv '127.0.0.53' ; then
resolv_conf="/run/systemd/resolve/resolv.conf"
else
resolv_conf="/etc/resolv.conf" resolv_conf="/etc/resolv.conf"
else
resolv_conf="/run/systemd/resolve/resolv.conf"
fi fi
# Extract nameservers and provide them in the required format # Extract nameservers and provide them in the required format
dns=$(grep -v '^#\|^;' "$resolv_conf" | grep '^nameserver' | grep -oE '[0-9]{1,3}(\.[0-9]{1,3}){3}' | xargs | sed -e 's/ /, /g') dns=$(grep -v '^#\|^;' "$resolv_conf" | grep '^nameserver' | grep -v '127.0.0.53' | grep -oE '[0-9]{1,3}(\.[0-9]{1,3}){3}' | xargs | sed -e 's/ /, /g')
;; ;;
2) 2)
dns="8.8.8.8, 8.8.4.4" dns="8.8.8.8, 8.8.4.4"
@ -504,7 +504,7 @@ EOF
echo -e '\xE2\x86\x91 That is a QR code containing the client configuration.' echo -e '\xE2\x86\x91 That is a QR code containing the client configuration.'
echo echo
# If the kernel module didn't load, system probably had an outdated kernel # If the kernel module didn't load, system probably had an outdated kernel
# We'll try to help, but will not will not force a kernel upgrade upon the user # We'll try to help, but will not force a kernel upgrade upon the user
if [[ ! "$is_container" -eq 0 ]] && ! modprobe -nq wireguard; then if [[ ! "$is_container" -eq 0 ]] && ! modprobe -nq wireguard; then
echo "Warning!" echo "Warning!"
echo "Installation was finished, but the WireGuard kernel module could not load." echo "Installation was finished, but the WireGuard kernel module could not load."