FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Filter out BLS entries not managed by bootc by Dudecake · Pull Request #2243 · bootc-dev/bootc · GitHub

/ bootc Public

Filter out BLS entries not managed by bootc - #2243

Open
Dudecake wants to merge 4 commits into
bootc-dev:mainfrom
Dudecake:filter-custom-bls-entries
ConversationCommits (4)ChecksFiles changed
Open

Filter out BLS entries not managed by bootc#2243
Dudecake wants to merge 4 commits into
bootc-dev:mainfrom
Dudecake:filter-custom-bls-entries

Conversation

Dudecake commented Jun 10, 2026

Copy link
Copy Markdown

Fixes #2228

The cases that the tests in the last commit check cannot occur anymore because of the changes in get_sorted_type1_boot_entries_helper. If they're unneeded, I can drop the commit.

bootc-bot Bot requested a review from jeckersb June 10, 2026 12:59
Dudecake force-pushed the filter-custom-bls-entries branch from dba7de3 to 9ade58e Compare June 10, 2026 13:08
Johan-Liebert1 requested changes Jun 10, 2026
View reviewed changes

Johan-Liebert1 left a comment •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

This would work, but only for the first boot, and will probably fail on updates and switches as these entries won't be copied to the staged directory.

Comment thread crates/lib/src/composefs_consts.rs

Dudecake commented Jun 10, 2026

Copy link
Copy Markdown
Author

This would work, but only for the first boot, and will probably fail on updates and switches as these entries won't be copied to the staged directory.

Sad face. That makes this pretty useless as installing to a populated ESP works without issue, only bootc status and bootc update are broken.

Would the caller of list_type1_entries have to filter out these entries before calling get_verity on them?

Johan-Liebert1 commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

Would the caller of list_type1_entries have to filter out these entries before calling get_verity on them?

yes, and these need special treatment for updates/switches. Also, we need to make sure these appear last in the boot entries list etc etc. There are a few more cases that need to be handled

Dudecake marked this pull request as draft June 11, 2026 04:46
Dudecake force-pushed the filter-custom-bls-entries branch from 9ade58e to 80be97c Compare June 22, 2026 06:47

Dudecake commented Jun 22, 2026

Copy link
Copy Markdown
Author

I've been looking at this last- and previous weekend and attempting to have the caller filter these entries out would require a lot of changes as the original filename isn't included in the return value of list_type1_entries.

Creating unique filenames for entries using the same efi argument would be possible (but quite annoying) by also putting the title and/or options in the filename, so instead in create_staged_bls_entries copies any non-managed BLS entry to the staging directory.

Dudecake marked this pull request as ready for review June 22, 2026 12:08
bootc-bot Bot requested a review from henrywang June 22, 2026 12:09
Johan-Liebert1 added the ci/tier-1 Run CI for tier-1 OS (centos-10) only label Jun 22, 2026
Johan-Liebert1 requested changes Jun 23, 2026
View reviewed changes

Johan-Liebert1 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

State resilience test seems to be failing with

                        content: Error:   x Assertion failed.
                        content:     ,-[/var/tmp/tmt/bootc-tmt-mldew2as-tmt-plans-integration-plan-45-composefs-corruped-state-resilience/tmt/plans/integration/plan-45-composefs-corruped-state-resilience/discover/default-0/tests/tmt/tests/booted/test-composefs-corruped-state-resilience.nu:51:12]
                        content:  50 |     
                        content:  51 | ,->     assert (
                        content:  52 | |           journalctl F_MESSAGE_ID=d264f924dadb4c31bff0412107d391fb
                        content:  53 | |           | str contains $"No origin file for deployment bad-verity"
                        content:  54 | |->     )
                        content:     : `---- It is not true.
                        content:  55 |     
                        content:     `----

This is because we log a journal message when we encounter an entry that bootc doesn't own (doesn't start with our prefix). I think it's better now to change this error message as we are handling these entries

Comment thread crates/lib/src/bootc_composefs/backwards_compat/bcompat_boot.rs Outdated
Comment thread crates/lib/src/composefs_consts.rs
Comment thread crates/lib/src/bootc_composefs/backwards_compat/bcompat_boot.rs Outdated

Dudecake commented Jun 30, 2026

Copy link
Copy Markdown
Author

Nooo...

I'm not really sure how these entries end up here as list_bootloader_entries receives them from the changed get_sorted_type1_boot_entries_helper. Or is this test for grub with a user.cfg file?

Dudecake force-pushed the filter-custom-bls-entries branch from 80be97c to 6307167 Compare July 6, 2026 06:32
Johan-Liebert1 requested changes Jul 6, 2026
View reviewed changes
Comment thread crates/lib/src/bootc_composefs/backwards_compat/bcompat_boot.rs
staged_entries.atomic_write(filename, new_entry.to_string().as_bytes())?;
}

let original_entries = boot_dir.open_dir(TYPE1_ENT_PATH)?;

Johan-Liebert1 Jul 6, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

This is fine, but this is only for backwards compatibility stuff. The actual code for writing the staged entries would be somewhere in crates/lib/src/bootc_composefs/boot.rs

Johan-Liebert1 commented Jul 6, 2026

Copy link
Copy Markdown
Collaborator

CI errors are unrelated to this PR

Dudecake force-pushed the filter-custom-bls-entries branch from 6307167 to 203a9f6 Compare July 20, 2026 06:38

Dudecake commented Jul 20, 2026

Copy link
Copy Markdown
Author

I'm not entirely happy with what I had to do to create a BootSetupType Upgrade in test_write_systemd_uki_config, but adding it to a (new) tmt test was a bit too intimidating

Dudecake force-pushed the filter-custom-bls-entries branch from 203a9f6 to 4024f97 Compare August 24, 2026 06:27
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Johan-Liebert1 Johan-Liebert1 requested changes
jeckersb Awaiting requested review from jeckersb
henrywang Awaiting requested review from henrywang

Requested changes must be addressed to merge this pull request.

Assignees

No one assigned

Labels

ci/tier-1 Run CI for tier-1 OS (centos-10) only

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Adding custom BLS entry blocks most bootc operations

2 participants

Back | FazBrowse Home | New Git URL