AB update: fix ACL verity tests for partition layout changes - #26
Closed
bfjelds (bfjelds) wants to merge 1 commit into
Closed
Conversation
For ab-update, ACL uses separate data and hash partitions for dm-verity instead of appending hash data after the filesystem. This changes: - GetUsrDeviceNode: use veritysetup status parsing instead of dmsetup (which returned comma-separated devices like vda3,vda2) - Add GetUsrHashDeviceNode to get the hash partition separately - VerityVerify: use separate hash device for ACL instead of hash-offset - harness.go: add skipIfMatch for verity dependency failures and separate verity-specific dependency check with NoVerityCorruptionCheck Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Member
Author
|
move from fork, replace with #27 |
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.
Updates the kola test harness and verity tests to work with the ab-update partition layout, where the usr data device and hash device are separate (rather than hash appended at an offset within the same device).
Validation
TBD
Changes
kola/tests/util/update.go
GetUsrDeviceNode: Useveritysetup statusto discover the data device instead ofdmsetup info, which doesn't reflect the new partition layout.GetUsrHashDeviceNodehelper that extracts the hash device fromveritysetup statusfor ACL.kola/tests/misc/verity.go
veritysetup verify.hash-offsetverification against a single device.btrfs inspect-internalfallback for computing offset on ACL.kola/harness.go
skipIfMatchfield to the "Dependency failed" emergency-shell check so that verity-related dependency failures are handled by a dedicated rule withNoVerityCorruptionCheckinstead of the genericNoEmergencyShellCheck.