root/ubuntu-based-kiosk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First boot: detect a stalled online install by silence (10 min), not a 40 min cap

Browse Source 
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01A97KUggSE3rBL8veDM5Mr4
This commit is contained in:
Claude
2026-10-23 15:37:34 +00:00
parent d30f7c7260
commit 763162fc57
1 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iso/firstboot/kiosk-firstboot
+36 -10
View File
@@ -22,10 +22,10 @@
# KIOSK_OFFLINE_WAIT=N on an ISO built with --offline: seconds to wait # KIOSK_OFFLINE_WAIT=N on an ISO built with --offline: seconds to wait
# for internet before installing from the bundled # for internet before installing from the bundled
# packages instead (default 90). # packages instead (default 90).
# KIOSK_ONLINE_TIMEOUT=N on an --offline ISO, unattended: if the online # KIOSK_STALL_TIMEOUT=N on an --offline ISO, unattended: if the install
# install hasn't finished after N seconds (a stalled # prints nothing for N seconds (a stalled download on
# download on a flaky link), stop it and finish from # a flaky link), stop it and finish from the bundled
# the bundled packages instead (default 2400). # packages instead (default 600).
################################################################################ ################################################################################
set -uo pipefail set -uo pipefail
@@ -44,7 +44,7 @@ OFFLINE_FLAG="$STATE_DIR/offline-mode"
KIOSK_UNATTENDED=0 KIOSK_UNATTENDED=0
KIOSK_OFFLINE_WAIT=90 KIOSK_OFFLINE_WAIT=90
KIOSK_ONLINE_TIMEOUT=2400 KIOSK_STALL_TIMEOUT=600
# shellcheck source=/dev/null # shellcheck source=/dev/null
[[ -f "$CONF" ]] && source "$CONF" [[ -f "$CONF" ]] && source "$CONF"
@@ -250,13 +250,39 @@ run_install() {
# runuser rather than sudo -u: sudo would set SUDO_USER=root, which # runuser rather than sudo -u: sudo would set SUDO_USER=root, which
# config.sh reads as "the admin running this tool". # config.sh reads as "the admin running this tool".
# A stalled download on a flaky connection would otherwise hang an # A stalled download on a flaky connection would otherwise hang an
# unattended install forever: with the offline bundle as a safety net, # unattended install forever. With the offline bundle as a safety net,
# cap the online attempt (timeout signals the whole process group). # watch the log: no new output for KIOSK_STALL_TIMEOUT seconds means
local -a cap=() # stuck, so the whole process group is stopped (the caller then
# finishes from the bundle).
if [[ "$KIOSK_UNATTENDED" == "1" ]] && have_bundle && [[ ! -f "$OFFLINE_FLAG" ]]; then if [[ "$KIOSK_UNATTENDED" == "1" ]] && have_bundle && [[ ! -f "$OFFLINE_FLAG" ]]; then
cap=(timeout --kill-after=30 "$KIOSK_ONLINE_TIMEOUT") touch "$LOG"
setsid bash -c '
runuser -u "$1" -- env -i "${@:4}" bash -c "cd \"\$1\" && exec ./install.sh" _ "$2" 2>&1 | tee -a "$3"
exit "${PIPESTATUS[0]}"
' _ "$ADMIN_USER" "$REPO_DEST" "$LOG" "${envs[@]}" &
local pid=$!
(
while kill -0 "$pid" 2>/dev/null; do
sleep 20
age=$(( $(date +%s) - $(stat -c %Y "$LOG") ))
if (( age > KIOSK_STALL_TIMEOUT )); then
echo
echo "No output for ${age}s - the online install looks stuck; stopping it."
kill -TERM -- "-$pid" 2>/dev/null
sleep 30
kill -KILL -- "-$pid" 2>/dev/null
break
fi fi
"${cap[@]}" runuser -u "$ADMIN_USER" -- env -i "${envs[@]}" \ done
) &
local watcher=$!
wait "$pid"
local rc=$?
kill "$watcher" 2>/dev/null
wait "$watcher" 2>/dev/null
return "$rc"
fi
runuser -u "$ADMIN_USER" -- env -i "${envs[@]}" \
bash -c 'cd "$1" && exec ./install.sh' _ "$REPO_DEST" \ bash -c 'cd "$1" && exec ./install.sh' _ "$REPO_DEST" \
2>&1 | tee -a "$LOG" 2>&1 | tee -a "$LOG"
return "${PIPESTATUS[0]}" return "${PIPESTATUS[0]}"