holm/zerotier-docker
1
1
Fork 0
forked from extern/zerotier-docker
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16 from Paraphraser/20220803-entrypoint-router-main

Browse Source 
unexpected script termination - entrypoint-router.sh
This commit is contained in:
Lukas Prettenthaler 2022-08-03 11:58:05 +02:00 committed by GitHub
commit 5548308e01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/entrypoint-router.sh
View File

@ -99,7 +99,8 @@ update_iptables() {
update_iptables "A" "adding"
# define where the ZeroTier daemon will write its output (if any)
TAIL_PIPE=$(mktemp /tmp/zerotier-ipc-XXXXXX)
TAIL_PIPE="/tmp/zerotier-ipc-log"
cat /dev/null >"${TAIL_PIPE}"
# start listening and echoing anything that appears there into this process
tail -f "${TAIL_PIPE}" &
@ -125,20 +126,12 @@ termination_handler() {
update_iptables "D" "removing"
# relay the termination message to the daemon
# (the pipe listener is cleaned up automatically)
if [ -d "/proc/${ZEROTIER_DAEMON_PID}" ] ; then
kill -TERM ${ZEROTIER_DAEMON_PID}
wait ${ZEROTIER_DAEMON_PID}
fi
# tell the pipe listener to go away too
if [ -d "/proc/${TAIL_PIPE_PID}" ] ; then
kill -TERM ${TAIL_PIPE_PID}
wait ${TAIL_PIPE_PID}
fi
# clean up the pipe file
rm "${TAIL_PIPE}"
}
# set up termination handler (usually catches TERM)