Merged
Conversation
Add support for deterministic systemd-sysext/confext merge ordering controlled by the runtime manifest's extension array position. - Add merge_index field to Extension struct for tracking priority - Assign inverted indices from manifest (first listed = highest priority) - HITL overrides inherit the manifest extension's priority slot - Bind mount staging dirs over extension-release.d to add prefixed extension-release files that match the prefixed symlink names - Clean up bind mounts and staging dirs during unmerge - Add Order column to ext status display - Add order field to JSON output
rustfmt is not available in the Yocto build environment, causing the build script to fail. The committed generated files are already formatted.
- Strip NN- order prefix from systemd-reported extension names so merged and available entries unify into a single row in ext status - Rewrite ext list to use the full extension scanner instead of a plain directory read; shows layer stack ordered high-to-low with MERGED/READY status correlated against mounted extensions - Add (high priority / top layer) / (low priority / base layer) labels to both ext list and ext status tables so overlay ordering is unambiguous - Update default extensions path from /var/lib/avocado/extensions to /var/lib/avocado/images to match actual install location - Update integration tests to reflect new ext list contract
mobileoverlord
force-pushed
the
rel/0.5.0
branch
from
2d1899e to
30ff0e2
Compare
mobileoverlord
force-pushed
the
rel/0.5.0
branch
from
a6a2335 to
28592eb
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
avocadoctl servesubcommandext statusduplicate rows caused byNN-order prefixes in systemd-reported extension namesext listto use the full extension scanner with layer-stack ordering and MERGED/READY status correlation(high priority / top layer)/(low priority / base layer)labels toext listandext statustables/var/lib/avocado/extensionsto/var/lib/avocado/imagesTest plan
cargo fmt && cargo clippy -- -D warnings && cargo testall pass (163 tests)avocadoctl ext listshows layer-ordered table with correct MERGED/READY statusavocadoctl ext statusshows single row per extension (no duplicates from order prefixes)avocadoctl servestarts the Varlink IPC server