From a8e0c0642e7a658cbc002d1a1d6b7c652835e44e Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 13 Jun 2021 20:15:49 +0200
Subject: [PATCH 1/2] Fix LAN block workaround on v2ray

---
 v2ray-core/files/usr/bin/v2ray-rules  | 2 +-
 v2ray-core/files/usr/bin/v2ray-rules6 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2ray-core/files/usr/bin/v2ray-rules b/v2ray-core/files/usr/bin/v2ray-rules
index 695f2819d..982ef92f2 100755
--- a/v2ray-core/files/usr/bin/v2ray-rules
+++ b/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' \
diff --git a/v2ray-core/files/usr/bin/v2ray-rules6 b/v2ray-core/files/usr/bin/v2ray-rules6
index 952d64b04..fdc383586 100755
--- a/v2ray-core/files/usr/bin/v2ray-rules6
+++ b/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' \

From 5896616ad5a9d4fda5c0523397809b631b69caee Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 14 Jun 2021 19:52:20 +0200
Subject: [PATCH 2/2] Try to fix config update when importing old config

---
 .../files/etc/uci-defaults/0000-omr-update        | 14 ++++++++++++++
 .../files/etc/uci-defaults/zzzzz-omr-update       | 15 ++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100755 openmptcprouter/files/etc/uci-defaults/0000-omr-update

diff --git a/openmptcprouter/files/etc/uci-defaults/0000-omr-update b/openmptcprouter/files/etc/uci-defaults/0000-omr-update
new file mode 100755
index 000000000..82a2cee3b
--- /dev/null
+++ b/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
diff --git a/openmptcprouter/files/etc/uci-defaults/zzzzz-omr-update b/openmptcprouter/files/etc/uci-defaults/zzzzz-omr-update
index 6e16cc6b0..e86103c55 100755
--- a/openmptcprouter/files/etc/uci-defaults/zzzzz-omr-update
+++ b/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/)"
-[ -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
-	uci -q set openmptcprouter.settings=settings
-	uci -q set openmptcprouter.settings.version=${OMRVERSION}
-	uci -q commit
-}
+uci -q set openmptcprouter.settings=settings
+uci -q set openmptcprouter.settings.version=${OMRVERSION}
+uci -q commit
+
 exit 0