Filter out BLS entries not managed by bootc

[Dudecake]

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.

[Johan-Liebert1]

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.

[Dudecake]

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]

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]

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.

[Johan-Liebert1]

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

[Dudecake]

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?

[Johan-Liebert1]

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]

CI errors are unrelated to this PR

[Dudecake]

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

[cgwalters]

@Johan-Liebert1 are you going to re-review this one? Only skimming at a high level it seems sane to me

[Johan-Liebert1]

Ah, yes, this was buried deep in my GH notifications

[Johan-Liebert1]

Looks good overall. Needs a rebase to fix conflicts

[Johan-Liebert1]

Repeated function https://github.com/bootc-dev/bootc/pull/2243/changes#diff-1604878878a88c4dcbd7f51444b69fc01a58e3ab48ade4e10b7a9ed05fa867f8R1232. Can be refactored

[Johan-Liebert1]

These tests are fine to have, but having proper integration tests in the tmt/tests directory would be much nicer