Skip to content

[pull] main from bootc-dev:main#130

Merged
pull[bot] merged 5 commits into
TheTechOddBug:mainfrom
bootc-dev:main
Apr 2, 2026
Merged

[pull] main from bootc-dev:main#130
pull[bot] merged 5 commits into
TheTechOddBug:mainfrom
bootc-dev:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Apr 2, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

Johan-Liebert1 and others added 5 commits April 2, 2026 09:19
Add a method in BLSConfig and Grub Menuconfig to get the boot artifact
name, i.e. get the name of the UKI or the name of the directory
containing the Kernel + Initrd. The names are stripped of all our custom
prefixes and suffixes, so basically they return the verity digest part
of the name.

This is useful for GC-ing Kernel + Initrd that are shared among multiple
deployments since we can't rely on the composefs= parameter in the
options as the cmdline verity digest might be different than the verity
digest of the shared Kernel + Initrd.

Tests written by Claude Code (Opus)

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Instead of looking in the ".origin" files and trying to match the
boot_digest to digests in other origin files, we now simply re-compute
the sha256sum for vmlinuz + initrd for all boot entries present.

This fixes the bug that arises after mutiple upgrades where the original
deployment that created the boot entry has been garbage collected, so we
end up linking to another deployment that does have the same boot
digest, but the verity digest doesn't match the verity digest used for
the name of the directory where we store the kernel + initrd pair.

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
This fixes a bug where a shared Type1 entry would get GCd even when it's
in use due to the original image that created it being deleted. Combined
with the fact that we were comparing the fsverity digest in the options
field of the BLS config (which will be different than the name of the
directory containing the vmlinuz + initrd pair).

Now, we compare against the directory name when GC-ing boot binaries

Fixes: #2102

Also, remove `allow(dead_code)` from BLS and Grub Menuconfig parsers as
now we use `boot_artifact_name` method

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Add a test to make sure we do not GC shared Type1 entries when they're
still referenced

Remove openh264 from repos to speed up installs

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Skip in TMT test to avoid duplicate with downstream

Signed-off-by: Xiaofeng Wang <henrywangxf@me.com>
@pull pull Bot locked and limited conversation to collaborators Apr 2, 2026
@pull pull Bot added the ⤵️ pull label Apr 2, 2026
@pull pull Bot merged commit 8d2f98b into TheTechOddBug:main Apr 2, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants