diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-02-28 19:46:28 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-03-04 18:50:25 +0100 |
| commit | 37dc9538b5032fafabdf76eefc0cd3ba4b2a95e9 (patch) | |
| tree | 5754786e5f61c060d1498b602f0e64e681d000be | |
| parent | wg-quick: if resolvconf/interface-order exists, use it (diff) | |
| download | wireguard-monolithic-historical-37dc9538b5032fafabdf76eefc0cd3ba4b2a95e9.tar.xz wireguard-monolithic-historical-37dc9538b5032fafabdf76eefc0cd3ba4b2a95e9.zip | |
wg-quick: if resolvconf/run/iface exists, use it
Some older broken resolvconfs don't support resolvconf -l, but do have a
file in a standard location, so use it.
| -rwxr-xr-x | src/tools/wg-quick.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/wg-quick.bash b/src/tools/wg-quick.bash index e93fb80..27bd4c7 100755 --- a/src/tools/wg-quick.bash +++ b/src/tools/wg-quick.bash @@ -203,7 +203,7 @@ save_config() { done while read -r address; do [[ $address =~ ^nameserver\ ([a-zA-Z0-9_=+:%.-]+)$ ]] && new_config+="DNS = ${BASH_REMATCH[1]}"$'\n' - done < <(resolvconf -l "$(resolvconf_iface_prefix)$INTERFACE" 2>/dev/null) + done < <(resolvconf -l "$(resolvconf_iface_prefix)$INTERFACE" 2>/dev/null || cat "/etc/resolvconf/run/interface/$(resolvconf_iface_prefix)$INTERFACE") [[ -n $MTU && $(ip link show dev "$INTERFACE") =~ mtu\ ([0-9]+) ]] && new_config+="MTU = ${BASH_REMATCH[1]}"$'\n' [[ -n $TABLE ]] && new_config+="Table = $TABLE"$'\n' [[ $SAVE_CONFIG -eq 0 ]] || new_config+=$'SaveConfig = true\n' |