Merge pull request #149 from Ysurac/develop

sync

openmptcprouter/files/etc/uci-defaults/0000-omr-update

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+cd /etc/uci-defaults || exit 0
+source /etc/os-release
+
+files="$(ls /etc/uci-defaults/)"
+[ -n "$files" ] && {
+	mkdir -p /usr/share/omr-update
+	if [ "$(grep rom /etc/mtab)" = "" ]; then
+		rm /usr/share/omr-update/*
+		cp /etc/uci-defaults/* /usr/share/omr-update
+	fi
+}
+exit 0

openmptcprouter/files/etc/uci-defaults/zzzzz-omr-update

@@ -4,15 +4,8 @@ cd /etc/uci-defaults || exit 0
 source /etc/os-release
 
 OMRVERSION=$(echo $VERSION | sed 's/v//')
-files="$(ls /etc/uci-defaults/)"
+uci -q set openmptcprouter.settings=settings
-[ -n "$files" ] && {
+uci -q set openmptcprouter.settings.version=${OMRVERSION}
-	mkdir -p /usr/share/omr-update
+uci -q commit
-	if [ "$(grep rom /etc/mtab)" = "" ]; then
+
-		rm /usr/share/omr-update/*
-		cp /etc/uci-defaults/* /usr/share/omr-update
-	fi
-	uci -q set openmptcprouter.settings=settings
-	uci -q set openmptcprouter.settings.version=${OMRVERSION}
-	uci -q commit
-}
 exit 0

v2ray-core/files/usr/bin/v2ray-rules

@@ -275,7 +275,7 @@ v2r_rules_iptchains_mkprerules() {
 	local proto="$1"
 
 	if [ -z "$o_ifnames" ]; then
-		echo "-I PREROUTING 1 -p $proto -j v2r_${rule}_pre_src"
+		echo "-A PREROUTING -p $proto -j v2r_${rule}_pre_src"
 	else
 		echo $o_ifnames \
 			| tr ' ' '\n' \

v2ray-core/files/usr/bin/v2ray-rules6

@@ -266,7 +266,7 @@ v2ray_rules6_iptchains_mkprerules() {
 	local proto="$1"
 
 	if [ -z "$o_ifnames" ]; then
-		echo "-I PREROUTING 1 -p $proto -j v2r6_${rule}_pre_src"
+		echo "-A PREROUTING -p $proto -j v2r6_${rule}_pre_src"
 	else
 		echo $o_ifnames \
 			| tr ' ' '\n' \