From 65f9e51e314152cf1f0d6aae187ef66b4212bbf7 Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Fri, 15 Jun 2018 20:52:54 +0200
Subject: [PATCH] Fix IP reset

---
 omr-update/files/etc/init.d/omr-update                 |  4 +++-
 .../files/etc/uci-defaults/1920-omr-network            | 10 +++++++---
 .../files/etc/uci-defaults/1930-omr-shadowsocks        |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/omr-update/files/etc/init.d/omr-update b/omr-update/files/etc/init.d/omr-update
index 421c974e7..a4b0de7dc 100755
--- a/omr-update/files/etc/init.d/omr-update
+++ b/omr-update/files/etc/init.d/omr-update
@@ -8,15 +8,17 @@ boot() {
 	. /lib/functions/system.sh
 
 	cd /etc/uci-defaults || return 0
+	source /etc/os-release
+
 	files="$(ls)"
 	[ -n "$files" ] && {
 		mkdir -p /usr/share/omr-update
 		if [ "$(grep rom /etc/mtab)" = "" ]; then
 			cp /etc/uci-defaults/* /usr/share/omr-update
 		fi
+		uci -q set openmptcprouter.settings.version=${VERSION}
 		return 0
 	}
-	source /etc/os-release
 	if [ "$(uci -q get openmptcprouter.settings.version)" != "${VERSION}" ]; then
 		cd /rom/etc/uci-defaults || cd /usr/share/omr-update || return 0
 		files="$(ls)"
diff --git a/openmptcprouter/files/etc/uci-defaults/1920-omr-network b/openmptcprouter/files/etc/uci-defaults/1920-omr-network
index 79183c6d6..f1163f56a 100755
--- a/openmptcprouter/files/etc/uci-defaults/1920-omr-network
+++ b/openmptcprouter/files/etc/uci-defaults/1920-omr-network
@@ -49,7 +49,11 @@ _setup_wan_interface() {
 	[ -n "$4" ] && uci -q set network.$1.type=$4
 }
 
-uci -q batch <<EOF
+if [ "$(uci -q get openmptcprouter.settings.version)" != "" ]; then
+	exit 0
+fi
+
+uci -q batch <<-EOF
 set network.lan=interface
 set network.lan.proto=static
 set network.lan.ipaddr=192.168.100.1
@@ -57,7 +61,7 @@ set network.lan.netmask=255.255.255.0
 set network.lan.ifname=eth0
 EOF
 
-uci -q batch <<EOF
+uci -q batch <<-EOF
 delete network.none
 delete network.if6rd
 reorder network.loopback=0
@@ -83,7 +87,7 @@ config_foreach _setup_multipath_off interface
 
 # Add the lan as a named routing table
 if ! grep -s -q "lan" /etc/iproute2/rt_tables; then
-    echo "50 lan" >> /etc/iproute2/rt_tables
+	echo "50 lan" >> /etc/iproute2/rt_tables
 fi
 uci -q set network.lan.ip4table='lan'
 
diff --git a/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks b/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks
index 4c2bc2a3e..c78e1015f 100755
--- a/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks
+++ b/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks
@@ -21,7 +21,7 @@ if [ "$NBCPU" -gt 2 ]; then
 	fi
 fi
 
-if [ "$(uci -q get shadowsocks-libev.hi.timeout)" = "200" ]; then
+if [ "$(uci -q get shadowsocks-libev.hi.timeout)" != "200" ]; then
 	uci -q batch <<-EOF > /dev/null
 		set shadowsocks-libev.hi.timeout=200
 		commit shadowsocks-libev