From a91665f768d9700436df53e0e94f9185c06fb78e Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Thu, 9 Apr 2020 21:24:30 +0000 Subject: [PATCH] Resolve "Multiple NICs bugfixes" --- scripts/install.sh | 2 +- scripts/subinstallers/iptables.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index e260a68..6857ea7 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -150,7 +150,7 @@ fi # Mistborn # final setup vars -iface=$(ip -o -4 route show to default | egrep -o 'dev [^ ]*' | awk '{print $2}') +iface=$(ip -o -4 route show to default | egrep -o 'dev [^ ]*' | awk 'NR==1{print $2}') figlet "Mistborn default NIC: $iface" #IPV4_PUBLIC=$(ip -o -4 route show default | egrep -o 'dev [^ ]*' | awk '{print $2}' | xargs ip -4 addr show | grep 'inet ' | awk '{print $2}' | grep -o "^[0-9.]*" | tr -cd '\11\12\15\40-\176' | head -1) # tail -1 to get last diff --git a/scripts/subinstallers/iptables.sh b/scripts/subinstallers/iptables.sh index 3731b11..3715306 100755 --- a/scripts/subinstallers/iptables.sh +++ b/scripts/subinstallers/iptables.sh @@ -12,10 +12,10 @@ if [ "$DISTRO" == "ubuntu" ]; then fi # default interface -iface=$(ip -o -4 route show to default | egrep -o 'dev [^ ]*' | awk '{print $2}') +iface=$(ip -o -4 route show to default | egrep -o 'dev [^ ]*' | awk 'NR==1{print $2}') # real public interface -riface=$(ip -o -4 route get 1.1.1.1 | egrep -o 'dev [^ ]*' | awk '{print $2}') +riface=$(ip -o -4 route get 1.1.1.1 | egrep -o 'dev [^ ]*' | awk 'NR==1{print $2}') # resetting iptables sudo iptables -F @@ -23,6 +23,7 @@ sudo iptables -t nat -F sudo iptables -X MISTBORN_LOG_DROP 2>/dev/null || true sudo iptables -X MISTBORN_WIREGUARD_INPUT 2>/dev/null || true sudo iptables -X MISTBORN_WIREGUARD_FORWARD 2>/dev/null || true +sudo iptables -X MISTBORN_WIREGUARD_OUTPUT 2>/dev/null || true sudo iptables -X MISTBORN_DOCKER_OUTPUT 2>/dev/null || true sudo iptables -X MISTBORN_DOCKER_INPUT 2>/dev/null || true