1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00

Merge pull request #139 from Ysurac/develop

sync
This commit is contained in:
suyuan 2021-05-21 22:10:26 +08:00 committed by GitHub
commit 817205a4fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions

View file

@ -1,9 +1,9 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2020 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
# Copyright (C) 2020-2021 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
# Released under GPL 3. See LICENSE for the full terms.
{
START=90
START=99
STOP=10
USE_PROCD=1
}

View file

@ -1126,10 +1126,10 @@ 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 [ "$(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