Skip to content

Map grub feature to composefs-backend and import parser/bls#1512

Merged
cgwalters merged 4 commits into
bootc-dev:mainfrom
cgwalters:drop-grub-feature
Aug 15, 2025
Merged

Map grub feature to composefs-backend and import parser/bls#1512
cgwalters merged 4 commits into
bootc-dev:mainfrom
cgwalters:drop-grub-feature

Conversation

@cgwalters

Copy link
Copy Markdown
Collaborator

Some prep work for merging the composefs-backend branch.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Code Review

This pull request prepares for merging the composefs-backend feature by renaming the grub feature and importing a new BLS parser. The new parser is well-tested, but I have a couple of suggestions to improve its correctness and adherence to the BLS specification. Specifically, the PartialEq implementation for BLSConfig seems incorrect, and the sorting logic deviates from the specification.

Comment thread crates/lib/src/parsers/bls_config.rs Outdated
Comment thread crates/lib/src/parsers/bls_config.rs
@cgwalters

Copy link
Copy Markdown
Collaborator Author

There's definitely more to do for bls, in particular we actually need to handle filenames too.

cgwalters and others added 4 commits August 15, 2025 17:16
This should make it easier to incrementally merge changes
here to main.

Signed-off-by: Colin Walters <walters@verbum.org>
Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>
Signed-off-by: Colin Walters <walters@verbum.org>
- Handle multiple initrd entries.
- Add support for machine-id and sort-key.

To do this we can't just map the keys into JSON because we need
to handle multiple values. Switch to a manual parser.

Assisted-by: Gemini CLI+gemini-2.5-pro
Signed-off-by: Colin Walters <walters@verbum.org>
Default string comparisons are wrong for this.

Signed-off-by: Colin Walters <walters@verbum.org>
@cgwalters cgwalters merged commit eb717ab into bootc-dev:main Aug 15, 2025
26 of 27 checks passed
@cgwalters cgwalters added the area/composefs Issues related to composefs label Sep 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/composefs Issues related to composefs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants