瀏覽代碼

Part two of fix to GitHub issue #118 -- need to test thoroughly though.

Adam Ierymenko 10 年之前
父節點
當前提交
7943414c89
共有 1 個文件被更改,包括 23 次插入2 次删除
  1. 23 2
      ext/installfiles/linux/init.d/zerotier-one

+ 23 - 2
ext/installfiles/linux/init.d/zerotier-one

@@ -65,6 +65,17 @@ case "$1" in
 		if [ $running -gt 0 ]; then
 		if [ $running -gt 0 ]; then
 			echo "Stopping ZeroTier One..."
 			echo "Stopping ZeroTier One..."
 			kill -TERM $pid
 			kill -TERM $pid
+			sleep 0.25
+			if [ -f "$zthome/zerotier-one.pid" ]; then
+				sleep 0.5
+			fi
+			if [ -f "$zthome/zerotier-one.pid" ]; then
+				sleep 1
+			fi
+			if [ -f "$zthome/zerotier-one.pid" ]; then
+				kill -KILL $pid >>/dev/null 2>&1
+				rm -f "$zthome/zerotier-one.pid"
+			fi
 		else
 		else
 			echo "ZeroTier One is not running."
 			echo "ZeroTier One is not running."
 		fi
 		fi
@@ -72,9 +83,19 @@ case "$1" in
 	restart|reload|force-reload|condrestart|try-restart)
 	restart|reload|force-reload|condrestart|try-restart)
 		echo "Restarting ZeroTier One..."
 		echo "Restarting ZeroTier One..."
 		if [ $running -gt 0 ]; then
 		if [ $running -gt 0 ]; then
-			kill -TERM $pid
+			kill -TERM $pid >>/dev/null 2>&1
+		fi
+		sleep 0.25
+		if [ -f "$zthome/zerotier-one.pid" ]; then
+			sleep 0.5
+		fi
+		if [ -f "$zthome/zerotier-one.pid" ]; then
+			sleep 1
+		fi
+		if [ -f "$zthome/zerotier-one.pid" ]; then
+			kill -KILL $pid >>/dev/null 2>&1
+			rm -f "$zthome/zerotier-one.pid"
 		fi
 		fi
-		while [ -f "$zthome/zerotier-one.pid" ]; do sleep 1; done
 		zerotier-one -d
 		zerotier-one -d
 		;;
 		;;
 	status)
 	status)