Pad vbmeta images during cvd fetch - #3192
Open
3405691582 wants to merge 1 commit into
Open
3405691582 wants to merge 1 commit into
3405691582 wants to merge 1 commit into
Conversation
The guest reads the vbmeta images with libavb, which expects to be able to read the maximum vbmeta size, so we pad the images in place to match this or the read will fail. This implies that the image location must be writable, which is problematic for particular use-cases. It is worthwhile noting that images are also modified during cvd fetch to de-sparse images before the images are quiescent on disk. While this change does not alleviate the need for in-place image modification, it does ensure that the images need not be modifiable after the cvd fetch occurs. assemble_cvd behavior is unchanged -- indeed it must not change, since it will need to operate correctly on images not sourced from cvd fetch.
Databean
approved these changes
Sep 17, 2026
Comment on lines
+60
to
+65
| bool IsVbmetaImage(std::string_view path) { | ||
| return absl::EndsWith(path, "/vbmeta.img") || | ||
| absl::EndsWith(path, "/vbmeta_system.img") || | ||
| absl::EndsWith(path, "/vbmeta_system_dlkm.img") || | ||
| absl::EndsWith(path, "/vbmeta_vendor_dlkm.img"); | ||
| } |
Member
There was a problem hiding this comment.
Not a huge fan of extra behavior for specific filenames, but this does look like the simplest change.
The vbmeta_system call at least is made explicitly
android-cuttlefish/base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_cvd.cc
Lines 286 to 295 in 01a5427
but the other case is buried inside
ExtractAll.
What do you think of changing ExtractAll to return the paths of extracted files, so that fetch_cvd.cc can do postprocessing like padding?
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
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.
The guest reads the vbmeta images with libavb, which expects to be able to read the maximum vbmeta size, so we pad the images in place to match this or the read will fail.
This implies that the image location must be writable, which is problematic for particular use-cases. It is worthwhile noting that images are also modified during cvd fetch to de-sparse images before the images are quiescent on disk. While this change does not alleviate the need for in-place image modification, it does ensure that the images need not be modifiable after the cvd fetch occurs.
assemble_cvd behavior is unchanged -- indeed it must not change, since it will need to operate correctly on images not sourced from cvd fetch.