Browse Source

Merge branch '29-nics' into 'master'

Resolve "Multiple NICs bugfixes"

Closes #29

See merge request cyber5k/mistborn!18
merge-requests/18/merge
Steven Foerster 6 years ago
parent
commit
3ee3663870
  1. 2
      scripts/install.sh
  2. 5
      scripts/subinstallers/iptables.sh

2
scripts/install.sh

@ -150,7 +150,7 @@ fi @@ -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

5
scripts/subinstallers/iptables.sh

@ -12,10 +12,10 @@ if [ "$DISTRO" == "ubuntu" ]; then @@ -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 @@ -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

Loading…
Cancel
Save