From e6d5432d84dbc6e2e7a425b15b58c2541dbe9d98 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Mon, 15 Oct 2018 01:09:42 +0800 Subject: [PATCH] fix zerotier boot loop --- package/lean/luci-app-zerotier/Makefile | 2 +- package/lean/luci-app-zerotier/root/etc/zerotier.start | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/luci-app-zerotier/Makefile b/package/lean/luci-app-zerotier/Makefile index 2d6792897..06d7bb2aa 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:=9 +PKG_RELEASE:=10 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-zerotier/root/etc/zerotier.start b/package/lean/luci-app-zerotier/root/etc/zerotier.start index ab40a0949..c44bfcac3 100755 --- a/package/lean/luci-app-zerotier/root/etc/zerotier.start +++ b/package/lean/luci-app-zerotier/root/etc/zerotier.start @@ -2,7 +2,7 @@ zero_enable=$(uci get zerotier.sample_config.enabled) -if [ $zero_enable -eq 1 ]; then +if [ ($zero_enable -eq 1) && (pgrep /usr/bin/zerotier-one >/dev/null) ]; then while [ "$(ifconfig | grep zt | awk '{print $1}')" = "" ] do