From: Moritz Warning <moritzwarning@web.de>
Date: Thu, 12 Apr 2018 15:48:14 +0000 (+0200)
Subject: zerotier: abort on zerotier-idtool error
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a70f13dcba01b4d355a0b5242572c5d6d3fcac41;p=feed%2Fpackages.git

zerotier: abort on zerotier-idtool error

Signed-off-by: Moritz Warning <moritzwarning@web.de>
---

diff --git a/net/zerotier/files/zerotier.init b/net/zerotier/files/zerotier.init
index 78fe87e947..6d0f4f239d 100644
--- a/net/zerotier/files/zerotier.init
+++ b/net/zerotier/files/zerotier.init
@@ -44,10 +44,13 @@ start_instance() {
 
 	if [ "$secret" = "generate" ]; then
 		echo "Generate secret - please wait..."
-		local tmp="/tmp/zt.$cfg.secret"
-		zerotier-idtool generate "$tmp" > /dev/null
-		secret="$(cat $tmp)"
-		rm "$tmp"
+		local sf="/tmp/zt.$cfg.secret"
+
+		zerotier-idtool generate "$sf" > /dev/null
+		[ $? -ne 0 ] && return 1
+
+		secret="$(cat $sf)"
+		rm "$sf"
 
 		uci set zerotier.$cfg.secret="$secret"
 		uci commit zerotier