From bdd71c20109a034243dc33a67ae93ea334988e87 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 21 May 2021 08:26:56 +0200 Subject: [PATCH 1/3] Fix error on loop detection --- mptcp/files/usr/share/omr/post-tracking.d/post-tracking | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking index 7e79ebc43..4ecbe2310 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking +++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking @@ -1129,7 +1129,7 @@ if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.lc)" = "" ] || [ $(($( local lanip="$(uci -q network.lan.ipaddr)" local masterip get_master_ip() { - if [ "$(openmptcprouter.$1.multipath)" = "master" ]; then + if [ "$(uci -q get openmptcprouter.$1.multipath)" = "master" ]; then masterip="$(uci -q get openmptcprouter.$1.publicip)" fi } @@ -1445,6 +1445,11 @@ if [ "$(iptables-save | grep omr-bypass)" = "" ] && [ "$(pgrep omr-bypass)" = "" /etc/init.d/omr-bypass fi +if [ -f /etc/backup/installed_packages.txt ]; then + _log "Reinstall packages..." + /etc/init.d/sysupgrade restart +fi + if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter | grep get_config=\'1\')" != "" ] || [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" != "" ]); then /etc/init.d/openmptcprouter-vps restart >/dev/null 2>&1 sleep 5 From a24ef0b9840e9279a098831984ebe1061d94129f Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 21 May 2021 08:40:49 +0200 Subject: [PATCH 2/3] Another fix for loop detection --- mptcp/files/usr/share/omr/post-tracking.d/post-tracking | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking index 4ecbe2310..bccd15eca 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking +++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking @@ -1126,7 +1126,7 @@ if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.lc)" = "" ] || [ $(($( } # Routing loop detection - local lanip="$(uci -q network.lan.ipaddr)" + local lanip="$(uci -q get network.lan.ipaddr)" local masterip get_master_ip() { if [ "$(uci -q get openmptcprouter.$1.multipath)" = "master" ]; then From de42eabfcad24d638be0dd558fd20be6d31bc208 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 21 May 2021 08:52:40 +0200 Subject: [PATCH 3/3] Run sysupgrade after all init --- luci-app-sysupgrade/root/etc/init.d/sysupgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/luci-app-sysupgrade/root/etc/init.d/sysupgrade b/luci-app-sysupgrade/root/etc/init.d/sysupgrade index 86eccd349..377c67944 100755 --- a/luci-app-sysupgrade/root/etc/init.d/sysupgrade +++ b/luci-app-sysupgrade/root/etc/init.d/sysupgrade @@ -1,9 +1,9 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2020 Ycarus (Yannick Chabanois) +# Copyright (C) 2020-2021 Ycarus (Yannick Chabanois) # Released under GPL 3. See LICENSE for the full terms. { - START=90 + START=99 STOP=10 USE_PROCD=1 }