void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1624 from erikh/silence-entrypoint-errors

Browse source 
silence catting files that don't exist in docker entrypoint
This commit is contained in:
Erik Hollensbe 2022-04-12 23:58:00 -07:00 • committed by GitHub
commit cade483a00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
entrypoint.sh.release
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
grepzt() { grepzt() {
[ -f /var/lib/zerotier-one/zerotier-one.pid -a -n "$(cat /var/lib/zerotier-one/zerotier-one.pid)" -a -d "/proc/$(cat /var/lib/zerotier-one/zerotier-one.pid)" ] [ -f /var/lib/zerotier-one/zerotier-one.pid -a -n "$(cat /var/lib/zerotier-one/zerotier-one.pid 2>/dev/null)" -a -d "/proc/$(cat /var/lib/zerotier-one/zerotier-one.pid 2>/dev/null)" ]
return $? return $?
} }
@ -34,7 +34,7 @@ mkztfile zerotier-one.port 0600 "9993"
killzerotier() { killzerotier() {
echo "Killing zerotier" echo "Killing zerotier"
kill $(cat /var/lib/zerotier-one/zerotier-one.pid) kill $(cat /var/lib/zerotier-one/zerotier-one.pid 2>/dev/null)
exit 0 exit 0
} }