From ac939ee905bd6201de79c726bc122724c054d2f3 Mon Sep 17 00:00:00 2001
From: lean <coolsnowwolf@gmail.com>
Date: Tue, 24 Mar 2020 19:38:58 +0800
Subject: [PATCH] luci-app-zerotier: adjust boot order

---
 package/lean/luci-app-adbyby-plus/Makefile                  | 2 +-
 package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby    | 5 ++---
 package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr | 2 +-
 package/lean/luci-app-zerotier/Makefile                     | 2 +-
 package/lean/luci-app-zerotier/root/etc/init.d/zerotier     | 3 ++-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/lean/luci-app-adbyby-plus/Makefile b/package/lean/luci-app-adbyby-plus/Makefile
index 89a6f3957a..1e9f74419c 100644
--- a/package/lean/luci-app-adbyby-plus/Makefile
+++ b/package/lean/luci-app-adbyby-plus/Makefile
@@ -10,7 +10,7 @@ LUCI_DEPENDS:=+adbyby +wget +ipset +dnsmasq-full
 LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-adbyby-plus
 PKG_VERSION:=2.0
-PKG_RELEASE:=69
+PKG_RELEASE:=71
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby b/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby
index 6a22d30d03..704e00df71 100755
--- a/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby
+++ b/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby
@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=98
+START=96
 STOP=10
 
 
@@ -184,7 +184,7 @@ reload_rule()
 	config_foreach get_config adbyby
 	del_rule
 	[ $enable -eq 0 ] && exit 0
-	iptables-save | grep ADBYBY >/dev/null || add_rule
+	add_rule
 }
 
 start()
@@ -200,7 +200,6 @@ start()
     /tmp/adbyby/adbyby >/dev/null 2>&1 &
     
     add_dns
-    iptables-save | grep ADBYBY >/dev/null || \
     add_rule
     /etc/init.d/dnsmasq reload
 	fi
diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
index cb6f5db232..a6bc4bdf2c 100755
--- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
+++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@@ -8,7 +8,7 @@
 # See /LICENSE for more information.
 #
 
-START=99
+START=70
 STOP=15
 
 SERVICE_DAEMONIZE=1
diff --git a/package/lean/luci-app-zerotier/Makefile b/package/lean/luci-app-zerotier/Makefile
index d557df631f..61d1f826ac 100644
--- a/package/lean/luci-app-zerotier/Makefile
+++ b/package/lean/luci-app-zerotier/Makefile
@@ -10,7 +10,7 @@ LUCI_TITLE:=LuCI for Zerotier
 LUCI_DEPENDS:=+zerotier
 LUCI_PKGARCH:=all
 PKG_VERSION:=1.0
-PKG_RELEASE:=17
+PKG_RELEASE:=18
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/package/lean/luci-app-zerotier/root/etc/init.d/zerotier b/package/lean/luci-app-zerotier/root/etc/init.d/zerotier
index 341077098d..500cd96635 100755
--- a/package/lean/luci-app-zerotier/root/etc/init.d/zerotier
+++ b/package/lean/luci-app-zerotier/root/etc/init.d/zerotier
@@ -1,6 +1,7 @@
 #!/bin/sh /etc/rc.common
 
-START=90
+START=99
+
 USE_PROCD=1
 
 PROG=/usr/bin/zerotier-one