From 9a12e03e1702e3130e5882f223eca432d270f900 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Mon, 15 Oct 2018 02:18:00 +0800
Subject: [PATCH] improve zerotier boot speed

---
 package/lean/luci-app-zerotier/Makefile                 | 2 +-
 package/lean/luci-app-zerotier/root/etc/init.d/zerotier | 4 ++--
 package/lean/luci-app-zerotier/root/etc/zerotier.start  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/lean/luci-app-zerotier/Makefile b/package/lean/luci-app-zerotier/Makefile
index 06d7bb2aa..dbe9900fc 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:=10
+PKG_RELEASE:=11
 
 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 018620ee0..7acbc6e8e 100755
--- a/package/lean/luci-app-zerotier/root/etc/init.d/zerotier
+++ b/package/lean/luci-app-zerotier/root/etc/init.d/zerotier
@@ -81,11 +81,11 @@ start_instance() {
 start_service() {
 	config_load 'zerotier'
 	config_foreach start_instance 'zerotier'
-	nohup /etc/zerotier.start >> /tmp/zero.log 2>&1 &
+	touch /tmp/zero.log && nohup /etc/zerotier.start > /tmp/zero.log 2>&1 &
 }
 
 stop_instance() {
-  nohup /etc/zerotier.stop > /tmp/zero.log 2>&1 &
+  rm -f /tmp/zero.log
 	local cfg="$1"
 
 	# Remove existing link or folder
diff --git a/package/lean/luci-app-zerotier/root/etc/zerotier.start b/package/lean/luci-app-zerotier/root/etc/zerotier.start
index c44bfcac3..e64da6930 100755
--- a/package/lean/luci-app-zerotier/root/etc/zerotier.start
+++ b/package/lean/luci-app-zerotier/root/etc/zerotier.start
@@ -2,13 +2,15 @@
 
 zero_enable=$(uci get zerotier.sample_config.enabled)
 
-if [ ($zero_enable -eq 1) && (pgrep /usr/bin/zerotier-one >/dev/null) ]; then
+if [ $zero_enable -eq 1 ]; then
 
+if [ -f /tmp/zero.log ];then
 while [ "$(ifconfig | grep zt | awk '{print $1}')" = "" ]  
 do 
    echo "zt interface not started yet, try build rules after 5s"
    sleep 5
 done
+fi
 
 nat_enable=$(uci get zerotier.sample_config.nat)
 zt0=$(ifconfig | grep zt | awk '{print $1}')
@@ -24,5 +26,3 @@ if [ $nat_enable -eq 1 ]; then
 fi
 
 fi
-
-