Skip to content

Pad vbmeta images during cvd fetch - #3192

Open
3405691582 wants to merge 1 commit into
google:mainfrom
3405691582:vbmeta_fetch
Open

3405691582 wants to merge 1 commit into
google:mainfrom
3405691582:vbmeta_fetch

Conversation

@3405691582

Copy link
Copy Markdown
Collaborator

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.

Comment thread base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_context.cc
3405691582 added a commit to 3405691582/android-cuttlefish that referenced this pull request Sep 21, 2026
In google#3192 we ensure that fetched files are modified during fetch, in
order to front-load modifications of fetched resources. Substitution
also requires modification of the fetched tree. cvd fetch and cvd start
can both trigger substitution -- we require both since we need to operate
on fetched and local builds.

However, we try to modify the tree during cvd start as well, even when
the symlinks are already correct. If we have made the host artefacts
read-only after fetching them, the subsequent substitution fails. There's
no need to regenerate the symlink; do it once and only once.
@3405691582 3405691582 added the kokoro:run Run e2e tests. label Sep 21, 2026
@GoogleCuttlefishTesterBot GoogleCuttlefishTesterBot removed the kokoro:run Run e2e tests. label Sep 21, 2026
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.
@3405691582 3405691582 added the kokoro:force-run Trigger a presubmit build unconditionally. label Sep 21, 2026
@GoogleCuttlefishTesterBot GoogleCuttlefishTesterBot removed the kokoro:force-run Trigger a presubmit build unconditionally. label Sep 21, 2026
pull Bot pushed a commit to emaheuxPEREN/android-cuttlefish that referenced this pull request Sep 21, 2026
In google#3192 we ensure that fetched files are modified during fetch, in
order to front-load modifications of fetched resources. Substitution
also requires modification of the fetched tree. cvd fetch and cvd start
can both trigger substitution -- we require both since we need to operate
on fetched and local builds.

However, we try to modify the tree during cvd start as well, even when
the symlinks are already correct. If we have made the host artefacts
read-only after fetching them, the subsequent substitution fails. There's
no need to regenerate the symlink; do it once and only once.
@3405691582
3405691582 added this pull request to the merge queue Sep 22, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Sep 22, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants