0.36.2: include overlay in rootfs/initramfs singleton discriminator#135
Merged
mobileoverlord merged 3 commits intomainfrom Apr 29, 2026
Merged
0.36.2: include overlay in rootfs/initramfs singleton discriminator#135mobileoverlord merged 3 commits intomainfrom
mobileoverlord merged 3 commits intomainfrom
Conversation
…tramfs The `feat: overlay support for rootfs and initramfs sysroots` change added an `overlay` field to `ImageConfig`, but the singleton-vs-named-map deserializer was not updated. As a result, `rootfs:` / `initramfs:` blocks that used `overlay` alongside `packages` / `filesystem` were rejected with: cannot mix singleton form ... and named-map form ... Add `overlay` to the field-name list passed to the named-or-single deserializer for both rootfs and initramfs, and add tests covering overlay-only and overlay-with-other-fields singleton forms.
The rootfs/initramfs install command runs with `source_environment: false`
to keep DNF's environment minimal, so `rsync` (provided by the SDK
toolchain, like in the original extension overlay path) is not on PATH
when the overlay snippet runs:
Applying overlay 'overlay' to initramfs sysroot (merge mode)
bash: line 250: rsync: command not found
Source `${AVOCADO_SDK_PREFIX}/environment-setup` inside the overlay
snippet itself (both merge and opaque modes) so the overlay step is
self-sufficient regardless of how the parent install command was
invoked. Add unit tests asserting the env source line is present in
both branches.
mobileoverlord
force-pushed
the
rel/0.36.2
branch
from
2469558 to
b5dad2d
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
cannot mix singleton form ... and named-map formerror whenrootfs:orinitramfs:blocks use the newoverlay:key alongsidepackages:/filesystem:. Theoverlayfield onImageConfigwas added but not registered with the singleton-vs-named-map deserializer, so it was treated as an unknown key and tipped the form-detection heuristic into mixed-form rejection.Test plan
cargo fmt --all -- --checkcargo clippy --all-targets --all-features -- -D warningscargo test --verbose(868 lib + 7 integration + 6 doc tests pass)test_rootfs_singleton_with_overlay_only,test_rootfs_singleton_with_overlay_and_packages,test_initramfs_singleton_with_overlay_only,test_initramfs_singleton_with_overlay_and_packages