Skip to content

fix incorrect 'wait' use in init-bottom #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
darkrain42 merged 2 commits into from
Apr 7, 2026
Merged

fix incorrect 'wait' use in init-bottom #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
572cea1
init-bottom: comment wait_for_tailscaled's interaction with init-prem…
darkrain42 Mar 18, 2026
123cbb7
init-bottom: Fix up incorrect 'wait $PID' usage
darkrain42 Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions scripts/init-bottom/tailscale
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/sh
# shellcheck disable=SC2039,SC3043
# SC3043: In POSIX sh, 'local' is undefined.

#set -e

Expand Down Expand Up @@ -27,12 +29,16 @@ if [ -e /etc/tailscale/initramfs/config ]; then
. /etc/tailscale/initramfs/config
fi

# Wait for the first of:
# - init-premount to launch tailscaled
# - init-premount to be signalled to stop bringing up networking
# - the configurable TAILSCALE_SHUTDOWN_TIMEOUT to be hit
wait_for_tailscaled()
{
# shellcheck disable=SC2039,SC3043
# SC3043: In POSIX sh, 'local' is undefined.
local pid exe timer="$TAILSCALE_SHUTDOWN_TIMEOUT"
pid="$(cat "$PIDFILE" 2>/dev/null)" || return 1
# Remove pidfile to signal to init-premount (if it's still waiting for
# networking) to stop.
rm -f "$PIDFILE"

while [ $timer -gt 0 ] && exe="$(readlink -f "/proc/$pid/exe" 2>/dev/null)"; do
Expand All @@ -46,6 +52,21 @@ wait_for_tailscaled()
return 1
}

wait_for_exit()
{
local pid="$1" exe timer="$TAILSCALE_SHUTDOWN_TIMEOUT"
while [ $timer -gt 0 ]; do
exe="$(readlink -f "/proc/$pid/exe" 2>/dev/null)" || return 0
if [ "$exe" != "$EXE" ]; then
return 0
fi
sleep 1
timer=$(( timer - 1))
done
log_warning_msg "tailscaled (pid $pid) did not exit within ${TAILSCALE_SHUTDOWN_TIMEOUT}s"
return 1
}


if PID="$(wait_for_tailscaled)"; then
if [ -n "$TAILSCALE_LOGOUT" ]; then
Expand All @@ -56,7 +77,7 @@ if PID="$(wait_for_tailscaled)"; then

log_begin_msg "Stopping tailscale"
kill -TERM "$PID"
wait "$PID" || true
wait_for_exit "$PID" || true
/sbin/tailscaled -cleanup 2>>/run/initramfs/tailscale.log
log_end_msg
fi
Expand Down
Loading