various: adjust to composefs-rs changes #1791
Merged
Conversation
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
github-actions
bot
added
area/install
Collaborator
|
Needs DCO, also looks like some of the hashes changed |
cgwalters
force-pushed
the
new-splitstream
branch
from
2f74390 to
561dd37
Compare
cgwalters
force-pushed
the
new-splitstream
branch
3 times, most recently
from
00a7bc5 to
e512306
Compare
Collaborator
|
I've rebased and tweaked this a bit, so it should probably be reviewed by someone other than me now. |
cgwalters
force-pushed
the
new-splitstream
branch
from
e512306 to
fae8808
Compare
jeckersb
requested changes
Jan 9, 2026
cgwalters
force-pushed
the
new-splitstream
branch
from
fae8808 to
3578b8e
Compare
Contributor
Author
allisonkarlitskaya
left a comment
allisonkarlitskaya
left a comment
There was a problem hiding this comment.
All looks good to me but this is technically my PR so I can't self-review.
I guess we'll do a composefs-rs release after this?
| let size = header.entry_size()?; | ||
|
|
||
| match layer_stream.read_exact(size as usize, ((size + 511) & !511) as usize)? { | ||
| match layer_stream.read_exact(size as usize, ((size as usize) + 511) & !511)? { |
Contributor
Author
There was a problem hiding this comment.
. o O ( Reminds me that I wanted to get rid of the magic handling of padding in the writer side . . )
cgwalters
force-pushed
the
new-splitstream
branch
from
3578b8e to
563435d
Compare
The `cp -a lbi/usr/. /usr` command was preserving local directory permissions which in one case for me have a restrictive mode 0750 which breaks booting. Switch to `install -D -m 0644` which explicitly sets file modes and creates parent directories with correct 755 permissions, while also simplifying the directory structure. Assisted-by: OpenCode (Opus 4.5) Signed-off-by: Colin Walters <[email protected]>
Update composefs-rs from rev b636e0e9 to e9008489, adapting to API changes: - merge_splitstream now takes 4 arguments instead of 3 - import_layer takes digest as string directly - pull/seal return (digest, verity) as (String, ObjectID) - SplitStreamWriter::new and write_stream have new signatures - initialize_composefs_repository returns String instead of Sha256Digest Co-authored-by: Allison Karlitskaya <[email protected]> Assisted-by: OpenCode (Claude claude-sonnet-4-20250514) Signed-off-by: Colin Walters <[email protected]>
cgwalters
force-pushed
the
new-splitstream
branch
from
563435d to
29da317
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This is mostly about the new splitstream API, but it also adopts the new library API exposed by the
cfsctlcrate, removing our private copy.