mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Merge branch 'test' into develop

Browse source
This commit is contained in:
suyuan 2021-02-16 10:13:09 +08:00
commit 7674697c1e
13 changed files with 61 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
openmptcprouter/files/etc/firewall.gre-tunnel
View file

@ -12,6 +12,7 @@ _setup_routes() {
config_get lookup $1 lookup
config_get gateway $1 gateway
intf=$(ifstatus $1 | jsonfilter -e '@.l3_device' | tr -d "\n")
[ -n "$intf" ] && intf=$(ifstatus "$1" | jsonfilter -q -e '@["device"]' | tr -d "\n")
if [ -n "$lookup" ] && [ -n "$intf" ] && [ -n "$gateway" ]; then
ip route replace default via $gateway dev $intf table $lookup
fi

3
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -1675,7 +1675,6 @@ _config_service() {
uci -q commit shadowsocks-libev
fi
}
[ -n "$vps_config" ] && uci -q set openmptcprouter.settings.firstboot=0
fi
if [ "$user_permission" != "ro" ]; then
#config_load shadowsocks-libev
@ -1711,6 +1710,8 @@ _config_service() {
[ "$error" = 0 ] && {
#logger -t "OMR-VPS" "No errors"
uci -q set openmptcprouter.${servername}.lastchange=$(date "+%s")
[ -n "$vps_config" ] && uci -q set openmptcprouter.settings.firstboot=0
}
#[ "$error" != 0 ] && logger -t "OMR-VPS" "Error !"
uci -q batch <<-EOF >/dev/null