Skip to content

Fix for ensure_config + re-enable bootc revdep CI#207

Merged
cgwalters merged 2 commits intocomposefs:mainfrom
cgwalters:fix-bootc-ci
Jan 9, 2026
Merged

Fix for ensure_config + re-enable bootc revdep CI#207
cgwalters merged 2 commits intocomposefs:mainfrom
cgwalters:fix-bootc-ci

Conversation

@cgwalters
Copy link
Collaborator

No description provided.

The ensure_config function was returning inconsistent values:
- When config already exists: returned (config_digest, config_id)
- When config is newly written: returned (content_id, config_id)

The content_id has the 'oci-config-' prefix added, while config_digest
does not. This caused downstream code (like bootc) to double-prefix
the identifier when calling create_filesystem, resulting in paths like
'oci-config-oci-config-sha256:...' instead of 'oci-config-sha256:...'.

Return the raw config_digest consistently in both cases.

Assisted-by: OpenCode (Opus 4.5)
Signed-off-by: Colin Walters <walters@verbum.org>
The recent API changes in composefs-rs (splitstream rework, sync story)
require corresponding updates in bootc. PR #1791 in bootc-dev/bootc
contains those updates.

Once that PR is merged, this should be changed back to track bootc main.

Assisted-by: OpenCode (Opus 4.5)
Signed-off-by: Colin Walters <walters@verbum.org>
@cgwalters
Copy link
Collaborator Author

image

🎉

Copy link
Collaborator

@allisonkarlitskaya allisonkarlitskaya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for picking this up and updating the work in bootc-dev/bootc#1791 !

@cgwalters cgwalters merged commit 49d4f50 into composefs:main Jan 9, 2026
6 of 15 checks passed
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.

2 participants