diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-10-31 11:38:09 +0100 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-10-31 17:25:23 +0100 |
commit | c13827622b6aeaaa15da948f71b7c16288fe88a9 (patch) | |
tree | 2e58aaaad1988fc69710be8bf7e73515e38cacf9 /contrib | |
parent | global: use fewer BUG_ONs (diff) | |
download | wireguard-monolithic-historical-c13827622b6aeaaa15da948f71b7c16288fe88a9.tar.xz wireguard-monolithic-historical-c13827622b6aeaaa15da948f71b7c16288fe88a9.zip |
wg-quick: allow for the hatchet, but not by default
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/examples/dns-hatchet/README | 8 | ||||
-rwxr-xr-x | contrib/examples/dns-hatchet/apply.sh | 6 | ||||
-rw-r--r-- | contrib/examples/dns-hatchet/hatchet.bash | 39 |
3 files changed, 53 insertions, 0 deletions
diff --git a/contrib/examples/dns-hatchet/README b/contrib/examples/dns-hatchet/README new file mode 100644 index 0000000..edb60ce --- /dev/null +++ b/contrib/examples/dns-hatchet/README @@ -0,0 +1,8 @@ +The DNS Hatchet +=============== + +This is a workaround for distributions without resolvconf or any proper +mechanism of setting the DNS. Running 'apply.sh` in this directory will +insert 'hatchet.bash` into the right place in 'wg-quick.bash`. It is +recommended that distributions without any resolvconf available run this +before calling 'make install` in their packaging scripts. diff --git a/contrib/examples/dns-hatchet/apply.sh b/contrib/examples/dns-hatchet/apply.sh new file mode 100755 index 0000000..ce35ecd --- /dev/null +++ b/contrib/examples/dns-hatchet/apply.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +ME="$(readlink -f "$(dirname "$(readlink -f "$0")")")" +TOOLS="$ME/../../../src/tools" + +sed -i "/~~ function override insertion point ~~/r $ME/hatchet.bash" "$TOOLS/wg-quick.bash" diff --git a/contrib/examples/dns-hatchet/hatchet.bash b/contrib/examples/dns-hatchet/hatchet.bash new file mode 100644 index 0000000..793684c --- /dev/null +++ b/contrib/examples/dns-hatchet/hatchet.bash @@ -0,0 +1,39 @@ +set_dns() { + [[ ${#DNS[@]} -gt 0 ]] || return 0 + + if [[ $(resolvconf --version 2>/dev/null) == openresolv\ * ]]; then + printf 'nameserver %s\n' "${DNS[@]}" | cmd resolvconf -a "$INTERFACE" -m 0 -x + else + echo "[#] mount \`${DNS[*]}' /etc/resolv.conf" >&2 + [[ -e /etc/resolv.conf ]] || touch /etc/resolv.conf + { cat <<-_EOF + # This file was generated by wg-quick(8) for use with + # the WireGuard interface $INTERFACE. It cannot be + # removed or altered directly. You may remove this file + # by running \`wg-quick down $INTERFACE', or if that + # poses problems, run \`umount /etc/resolv.conf'. + + _EOF + printf 'nameserver %s\n' "${DNS[@]}" + } | unshare -m --propagation shared bash -c "$(cat <<-_EOF + set -e + mount --make-private /dev/shm + mount -t tmpfs none /dev/shm + cat > /dev/shm/resolv.conf + mount -o remount,ro /dev/shm + mount -o bind,ro /dev/shm/resolv.conf /etc/resolv.conf + _EOF + )" + fi + HAVE_SET_DNS=1 +} + +unset_dns() { + [[ ${#DNS[@]} -gt 0 ]] || return 0 + + if [[ $(resolvconf --version 2>/dev/null) == openresolv\ * ]]; then + cmd resolvconf -d "$INTERFACE" + else + cmd umount /etc/resolv.conf + fi +} |