From 9b32a6aab556b9bb60087cde8316fce1b37b0eca Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 18 Mar 2021 15:50:12 +0100 Subject: [PATCH] Fix --- omr-6in4/files/etc/init.d/omr-6in4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/omr-6in4/files/etc/init.d/omr-6in4 b/omr-6in4/files/etc/init.d/omr-6in4 index e9ef23296..907be1c4c 100755 --- a/omr-6in4/files/etc/init.d/omr-6in4 +++ b/omr-6in4/files/etc/init.d/omr-6in4 @@ -18,7 +18,7 @@ set_ipv6_state() { local disable_ipv6="$(uci -q get openmptcprouter.settings.disable_ipv6)" [ -z "$disable_ipv6" ] && disable_ipv6="1" #previous=$(sysctl -qn net.ipv6.conf.all.disable_ipv6 | tr -d "\n") - previous="$(uci get network.lan.ipv6)" + previous="$(uci -q get network.lan.ipv6)" #sysctl -qw net.ipv6.conf.all.disable_ipv6=$disable_ipv6 #sed -i "s:^net.ipv6.conf.all.disable_ipv6=[0-9]*:net.ipv6.conf.all.disable_ipv6=$disable_ipv6:" /etc/sysctl.d/zzz_openmptcprouter.conf sed -i "s:^net.ipv6.conf.all.disable_ipv6=[0-9]*::" /etc/sysctl.d/zzz_openmptcprouter.conf @@ -40,6 +40,8 @@ set_ipv6_state() { delete dhcp.lan.ra_default delete dhcp.lan.ra_management delete dhcp.lan.ra_preference + unbound.ub_main.protocol='ip4_only' + commit unbound del_list v2ray.main.inbounds="omr6" commit v2ray EOF @@ -50,6 +52,7 @@ set_ipv6_state() { commit dhcp commit shadowsocks-libev EOF + [ ! -f /etc/wgetrc ] && cp /etc/wgetrc4 /etc/wgetrc else logger -t "omr-6in4" "Enable IPv6" uci -q batch <<-EOF >/dev/null @@ -66,6 +69,8 @@ set_ipv6_state() { set network.omr6in4.force_link=1 set network.omr6in4.metric=1 delete network.omr6in4.auto + unbound.ub_main.protocol='mixed' + commit unbound EOF if [ "$(network.lan.ip6assign)" = "" ]; then uci -q set network.lan.ip6assign='60' @@ -92,6 +97,7 @@ set_ipv6_state() { EOF /etc/init.d/v2ray restart fi + rm -f /etc/wgetrc fi /etc/init.d/odhcpd restart if [ "$previous" != "1" ]; then