Skip to content

Bake the image-install marker so feed detects overlay-image feeders #228

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
d4rken merged 1 commit into from
Jul 1, 2026
Merged

Bake the image-install marker so feed detects overlay-image feeders #228

Show file tree
Hide file tree
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
13 changes: 13 additions & 0 deletions stage-airplanes/06-firstboot/00-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,19 @@ printf '%s\n' "${AIRPLANES_FEED_UPDATE_CHANNEL}" \
> "${ROOTFS_DIR}/etc/airplanes/release-channel"
chmod 0644 "${ROOTFS_DIR}/etc/airplanes/release-channel"

# Image-install provenance marker. Its presence tells the feed daemons this is
# an overlay-image feeder, distinguishing it from a standalone feed install
# (which has neither marker nor binary) and from a legacy image (detected
# instead by the baked /usr/bin/airplanes-feeder binary the marker post-dates).
# Only presence is contractual: feed reads it with `-f` and never sources it,
# so the body is a shell-safe comment for anyone who cats the file. Baked here
# rather than delivered by the runtime overlay so the flag stays permanent
# across overlay updates, rollbacks, or removal — the same reason
# release-channel is baked.
printf '%s\n' '# airplanes.live image-install marker; presence signals an overlay-image feeder.' \
> "${ROOTFS_DIR}/etc/airplanes/image-install"
chmod 0644 "${ROOTFS_DIR}/etc/airplanes/image-install"

# pi-gen's export-image stage copies ${ROOTFS_DIR}/boot/firmware/* onto the
# FAT partition during image assembly, so writing the template here lands it
# on partition 1 where SD-card editors can reach it.
Expand Down
19 changes: 14 additions & 5 deletions test/overlay-smoke-inner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,12 @@ echo "==> contract assertions"
fail() { echo "FAIL: $*" >&2; exit 1; }
# Stage 01 is setup-only now (service account + state dirs). Feed artifacts
# (feed-airplanes binary, apl-feed CLI, daemon wrappers, systemd units, runtime
# libs, mlat-client venv, feed.env, image-install marker, enable links) arrive
# through the runtime overlay at stage 02 (managed_paths + migrations), which
# this fast smoke does NOT run. Assertions below cover only what stages 00 + 01
# + 06 produce, not the overlay-delivered feed surface. The full image build +
# boot-smoke cover the feed overlay path end to end.
# libs, mlat-client venv, feed.env, enable links) arrive through the runtime
# overlay at stage 02 (managed_paths + migrations), which this fast smoke does
# NOT run. Assertions below cover only what stages 00 + 01 + 06 produce, not the
# overlay-delivered feed surface. The full image build + boot-smoke cover the
# feed overlay path end to end. (The /etc/airplanes/image-install provenance
# marker is baked by stage 06, not the overlay, so it IS asserted below.)
[[ -d /etc/airplanes ]] || fail "/etc/airplanes dir missing (stage 01 chroot)"
id -u airplanes-feed >/dev/null 2>&1 || fail "airplanes-feed user missing (stage 01 chroot)"
getent group airplanes-feed >/dev/null 2>&1 || fail "airplanes-feed group missing (stage 01 chroot)"
Expand Down Expand Up @@ -264,6 +265,14 @@ esac
[[ "$release_channel_content" == "$AIRPLANES_FEED_UPDATE_CHANNEL" ]] \
|| fail "release-channel content '$release_channel_content' does not match AIRPLANES_FEED_UPDATE_CHANNEL='$AIRPLANES_FEED_UPDATE_CHANNEL'"

# image-install marker: stage 06 bakes it so the feed daemons detect an
# overlay-image feeder (airplanes-feed.sh sets IMAGE_INSTALL=1 on presence).
# Baked into /etc rather than overlay-delivered so it survives overlay updates,
# rollbacks, or removal.
[[ -f /etc/airplanes/image-install ]] || fail "image-install marker missing"
[[ "$(stat -c %a /etc/airplanes/image-install)" == "644" ]] \
|| fail "image-install marker mode != 0644"

# Build-manifest sentinel written by stage 00.
[[ -s /etc/airplanes/.build-pi-gen-sha ]] || fail ".build-pi-gen-sha missing or empty"

Expand Down