Skip to content

Read the kit commit as root in the reconcile check too, and do not re-arm a running setup #127

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
solutionphil merged 1 commit into from
Sep 5, 2026
Merged

Read the kit commit as root in the reconcile check too, and do not re-arm a running setup #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion scripts/apply-reconcile-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,31 @@ STAMP="$DATA/.arco-reconcile-done"
# If neither can say, do nothing -- guessing here would arm the reconcile on every boot for ever.
cur=""
if [ -d "$KIT/.git" ] && command -v git >/dev/null 2>&1; then
cur="$(git -C "$KIT" rev-parse HEAD 2>/dev/null || true)"
# -c safe.directory: this also runs as ROOT (ensure-imageid.sh, drop-in 19) against a clone owned by
# the printer user, and a plain `git -C` refuses that as dubious ownership. Without it the fallback
# below answered with the flat .kit-commit baked into the image -- a value that never moves -- so
# the stamp could never match and the root-side setup ran on EVERY klipper start: 56 runs in the
# log on 2026-09-05, three of them for one and the same kit commit within twenty minutes, each a
# 60 s run competing with Moonraker, Spoolman and the display for the two service cores. The same
# trap, fixed the same way, sits in optimize-boot.sh where the stamp is written.
cur="$(git -c safe.directory='*' -C "$KIT" rev-parse HEAD 2>/dev/null || true)"
# A clone git cannot read is a fault to leave alone, not a reason to compare against a constant:
# with .git present the flat file is never the truth.
[ -n "$cur" ] || exit 0
fi
[ -n "$cur" ] || cur="$(tr -dc '0-9a-f' < "$KIT/.kit-commit" 2>/dev/null | head -c 40)"
[ -n "$cur" ] || exit 0

last="$(head -c 40 "$STAMP" 2>/dev/null || true)"
[ "$cur" = "$last" ] && exit 0

# Drop-in 19 runs this as root and starts the setup at once; drop-in 25 runs it again as the owner a
# few seconds later, while that run is still going and the stamp is not yet written. Re-arming then
# buys a second full run on the next start -- the log showed most kit commits recorded twice.
if systemctl is-active --quiet arco-reconcile.service 2>/dev/null; then
exit 0
fi

# No stamp at all is the interesting case rather than an error: it means optimize-boot.sh has never
# recorded a run here, which is true of a printer updated from the web interface since before this guard
# existed. Arm it once; from then on the stamp keeps it quiet.
Expand Down