diff --git a/network/hopik/dhcpcd.enter-hook b/network/hopik/dhcpcd.enter-hook index 4418a1f997b55d67dd425c5ab3c59f31778e838a..537c92877da03a438bacc520bdcf78f116265e9e 100644 --- a/network/hopik/dhcpcd.enter-hook +++ b/network/hopik/dhcpcd.enter-hook @@ -45,18 +45,14 @@ then if [ "$reason" == STATIC6 ] then echo $msg_prefix set ipv6 default route - route6 default via 2001:718:1e03:81a::1 dev w + route6 default via 2001:718:1e03:81a::1 dev w metric 3004 fi fi if [ "$ifssid" == blatto-jk-5g ] || [ "$ifssid" == blatto-jk-2g ] then conntrack_hack - if [ "$reason" == STATIC6 ] - then - route6 default via 2a01:510:d504:7510::1 dev w - route 10.12.0.0/16 via 10.12.11.1 dev wg-blatto - fi + route6 default via 2a01:510:d504:751a::1 dev w metric 3004 fi if [ "$ifssid" == samet-5G ] @@ -64,7 +60,7 @@ then conntrack_hack fi - if [ "$ifssid" == blatto-jk-5g ] || [ "$ifssid" == blatto-jk-2g ] + if [ "$ifssid" == CDWiFi ] then if [ "$reason" == BOUND ] then diff --git a/network/hopik/scripts/con-sm b/network/hopik/scripts/con-sm index c19100c2813467499d1ef165840e258022742a77..1a5e92d7e6d5a73bcfe357229e1771be0adbdc8f 100755 --- a/network/hopik/scripts/con-sm +++ b/network/hopik/scripts/con-sm @@ -1,6 +1,5 @@ #!/bin/sh - -set -ueo pipefail +set -o xtrace #interface=enp3s0f4u1u1 interface=sm @@ -9,8 +8,8 @@ echo R | socat unix:/run/conntrack_hack - ip link set $interface up ip addres add 10.12.11.22/24 dev $interface ip addres add 2a01:510:d504:751a::22/64 dev $interface -ip route add 10.12.0.0/16 via 10.12.11.1 dev $interface +ip route add 10.12.0.0/16 via 10.12.11.1 dev $interface metric 1000 ip route add 2a01:510:d504:7500::0/56 via 2a01:510:d504:751a::1 dev wg-blatto metric 1000 -ip route add default via 10.12.11.1 dev $interface -ip route add default via 2a01:510:d504:751a::1 dev $interface +ip route add default via 10.12.11.1 dev $interface metric 1000 +ip route add default via 2a01:510:d504:751a::1 dev $interface metric 1000 (echo domain jk.blatto.eu; echo nameserver 10.12.11.1 ) | resolvconf -a $interface