Skip to content

Commit

Permalink
🔨 Migrate old-style base scripts s6-rc (#163)
Browse files Browse the repository at this point in the history
  • Loading branch information
frenck authored Dec 14, 2022
1 parent fec8503 commit 0ed97fd
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 11 deletions.
Empty file.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: ZeroTier One
# Generates an identiy in case it does not exists yet
Expand Down
1 change: 1 addition & 0 deletions zerotier/rootfs/etc/s6-overlay/s6-rc.d/init-zerotier/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions zerotier/rootfs/etc/s6-overlay/s6-rc.d/init-zerotier/up
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-zerotier/run
Empty file.
Empty file.
Empty file.
27 changes: 27 additions & 0 deletions zerotier/rootfs/etc/s6-overlay/s6-rc.d/zerotier/finish
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: ZeroTier One
# Take down the S6 supervision tree when ZeroTier fails
# ==============================================================================
declare exit_code
readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
readonly exit_code_service="${1}"
readonly exit_code_signal="${2}"
readonly service="ZeroTier One"

bashio::log.info \
"Service ${service} exited with code ${exit_code_service}" \
"(by signal ${exit_code_signal})"

if [[ "${exit_code_service}" -eq 256 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then
echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
fi
[[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
elif [[ "${exit_code_service}" -ne 0 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then
echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
fi
exec /run/s6/basedir/bin/halt
fi
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: ZeroTier One
# Runs ZeroTier One
Expand Down
1 change: 1 addition & 0 deletions zerotier/rootfs/etc/s6-overlay/s6-rc.d/zerotier/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
longrun
11 changes: 0 additions & 11 deletions zerotier/rootfs/etc/services.d/zerotier/finish

This file was deleted.

0 comments on commit 0ed97fd

Please sign in to comment.