Make bootupd metadata generation configurable per distro by pcdubs · Pull Request #1958 · osbuild/images

pcdubs · 2025-10-17T19:01:15Z

Add a configurable option for bootupd metadata generation that allows
distributions to enable it only where the bootupd package is available.

This introduces the bootupd_gen_metadata field in ImageConfig, which
controls whether bootupctl backend generate-update-metadata is run for
ostree commits. Distributions can set this conditionally based on
version to ensure bootupctl is only invoked when bootupd is present.

supakeen · 2025-10-18T18:15:46Z

Run:

go fmt ./...
./tools/gen-manifest-checksums.sh

and amend your commit with the changes; this will make the CI go green :)

achilleas-k

TY. LGTM!

supakeen · 2025-10-21T04:42:24Z

I'm wondering if this is OK to apply across the board like this. It's probably fine for Fedora; but does this work (for example) on RHEL 8 or do we need to make this into an image config option that's only applied where things are new enough?

supakeen

Looking at the CI this is indeed failing to work for RHEL-8, and RHEL-9:

subprocess.CalledProcessError: Command '['chroot', '/run/osbuild/tree', '/usr/bin/bootupctl', 'backend', 'generate-update-metadata', '/']' returned non-zero exit status 127.

It fails specifically because there's no bootupctl installed in RHEL-8, or RHEL-9 (is it available?).

chroot: failed to run command ‘/usr/bin/bootupctl’: No such file or directory

Depending on the outcome of the above there are two options:

Include bootupd on RHEL-8/RHEL-9 (if it exists and is of new enough version).
Make this an option in image config (or perhaps: on the distro) and only set it where it's supported (this would let us set it per-minor as well).

@pcdubs This would make the PR a bunch more involved; let me know if you want to handle it yourself or if you want me to force-push things into this PR for you.

pcdubs · 2025-10-22T00:18:20Z

Depending on the outcome of the above there are two options:

Include bootupd on RHEL-8/RHEL-9 (if it exists and is of new enough version).

Make this an option in image config (or perhaps: on the distro) and only set it where it's supported (this would let us set it per-minor as well).

@pcdubs This would make the PR a bunch more involved; let me know if you want to handle it yourself or if you want me to force-push things into this PR for you.

Updated to option#2.

Updated to Option#2

supakeen · 2025-10-22T17:22:21Z

Ah, I see rawhide for Fedora now started failing in your PR due to no fault of your own:

Failed to enable unit: Unit greenboot-grub2-set-counter.service does not exist

If you want you can address it in this PR (a conditional on Fedora < 44) or I can PR it and you can rebase after?

Other than that this PR is good now :)

say-paul · 2025-10-23T06:50:38Z

Ah, I see rawhide for Fedora now started failing in your PR due to no fault of your own:
Failed to enable unit: Unit greenboot-grub2-set-counter.service does not exist
If you want you can address it in this PR (a conditional on Fedora < 44) or I can PR it and you can rebase after?

Other than that this PR is good now :)

I have addressed this is in: 59ac5d6
~~Seems to work for f43 but not rawhide.~~
I see for F43 its still pulling in the old greenboot. I wonder why its doing so as new version is already out: https://packages.fedoraproject.org/pkgs/greenboot-rs/greenboot/

supakeen · 2025-10-23T07:03:31Z

Ah, I see rawhide for Fedora now started failing in your PR due to no fault of your own:
Failed to enable unit: Unit greenboot-grub2-set-counter.service does not exist
If you want you can address it in this PR (a conditional on Fedora < 44) or I can PR it and you can rebase after?
Other than that this PR is good now :)
I have addressed this is in: 59ac5d6 ~~Seems to work for f43 but not rawhide.~~ I see for F43 its still pulling in the old greenboot. I wonder why its doing so as new version is already out: https://packages.fedoraproject.org/pkgs/greenboot-rs/greenboot/

As for why it's not failing on Fedora 43:

It's pulling in the old version because at the date we made the snapshots that we use in our CI the old version was likely still in Fedora 43 (due to freeze, or such).

This is "expected" to start failing in Fedora 43 as well as soon as we update our snapshots and I have started a snapshot-update job.

From a quick scan I don't think shallow_merge is the right thing to use in this case or something finicky with the condition. I'll take a look at what can/should be used for this and PR it so we can rebase this PR on top of it.

Can you confirm if:

- "NetworkManager.service"
- "firewalld.service"
- "sshd.service"
- "greenboot-healthcheck"

Is the full set of services that should be enabled in Fedora >= 43?

say-paul · 2025-10-23T07:13:44Z

Can you confirm if:
- "NetworkManager.service"
- "firewalld.service"
- "sshd.service"
- "greenboot-healthcheck"
Is the full set of services that should be enabled in Fedora >= 43?

Yes

supakeen · 2025-10-23T08:42:51Z

So I looked into this and it's our CI doing something funky; when I generate manifests locally for Fedora rawhide they don't contain these services, but when they're being built in CI they do. I'll need to dig a bit deeper unless @achilleas-k or @ondrejbudai already know what's wrong here :)

Add a configurable option for bootupd metadata generation that allows distributions to enable it only where the bootupd package is available. This introduces the bootupd_gen_metadata field in ImageConfig, which controls whether bootupctl backend generate-update-metadata is run for ostree commits. Distributions can set this conditionally based on version to ensure bootupctl is only invoked when bootupd is present. Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>

supakeen · 2025-10-23T09:34:01Z

Ok, this was caused by the conditions field being added to iot-commit's image_config. Since it was already using a YAML anchor to reference an earlier struct containing a conditions key definining it again overwrites the previous conditions key.

This could be fixed by either moving the condition into &image_config_iot_enabled_services, or, since this applies to >= Fedora 41 and we don't build any EOL distros we can drop the condition entirely.

I've done the latter and force pushed this PR.

lzap

Great. Thank you.

lzap · 2025-10-23T12:47:54Z

pkg/distro/image_config.go

+	// When enabled, runs bootupctl backend generate-update-metadata to transform
+	// /usr/lib/ostree-boot into bootupd-compatible update metadata.
+	// Only set this to true if the bootupd package is available in the image.
+	BootupdGenMetadata *bool `yaml:"bootupd_gen_metadata,omitempty"`


Might not need to be a pointer but I am unsure about if that is a hard rule for YAML distro defs so this is fine.

Changes with 0.210.0 ---------------- - Make bootupd metadata generation configurable per distro (osbuild/images#1958) - Author: Paul Whalen, Reviewers: Lukáš Zapletal, Simon de Vlieger - many: add support for bootc container based anaconda ISOs (HMS-9495) (osbuild/images#1906) - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger, Tomáš Hozza - osbuild/osbuild-exec: make osbuild command a variable (osbuild/images#1965) - Author: Sanne Raymaekers, Reviewers: Lukáš Zapletal, Simon de Vlieger Changes with 0.211.0 ---------------- - Update osbuild dependency commit ID to latest (osbuild/images#1968) - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger - Update snapshots to 20251023 (osbuild/images#1967) - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger - deps: switch yaml libraries (osbuild/images#1970) - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Michael Vogt - osbuild/monitor: increase status scanner buffer size to 16MiB (osbuild/images#1977) - Author: Sanne Raymaekers, Reviewers: Michael Vogt, Simon de Vlieger - osbuild: tweak how we can mock osbuild slightly (osbuild/images#1969) - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Sanne Raymaekers - schutzbot/terraform: bump terraform sha (osbuild/images#1976) - Author: Florian Schüller, Reviewers: Achilleas Koutsou, Sanne Raymaekers, Simon de Vlieger Changes with 0.212.0 ---------------- - distro,manifest: have a single `LoraxTemplates` type (osbuild/images#1975) - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger - distro: cleanup/reuse YAML for bootc ISO (osbuild/images#1971) - Author: Michael Vogt, Reviewers: Lukáš Zapletal, Simon de Vlieger - distro: cleanup/reuse YAML for bootc distro (osbuild/images#1944) - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger - distro: load distros from multiple files (osbuild/images#1974) - Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza - osbuild: switch from a bufio.Scanner to a bufio.Reader (osbuild/images#1978) - Author: Michael Vogt, Reviewers: Lukáš Zapletal, Simon de Vlieger - reporegistry: various cleanups (osbuild/images#1980) - Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza - various: fix `make gh-action-test` and update README (osbuild/images#1981) - Author: Michael Vogt, Reviewers: Lukáš Zapletal, Simon de Vlieger Changes with 0.213.0 ---------------- - data: update fedora 43 repositories (osbuild/images#1983) - Author: Simon de Vlieger, Reviewers: Michael Vogt, Sanne Raymaekers - osbuild-exec: add buildlog and monitor support (osbuild/images#1966) - Author: Sanne Raymaekers, Reviewers: Michael Vogt, Simon de Vlieger

supakeen self-assigned this Oct 18, 2025

supakeen requested review from achilleas-k, supakeen and thozza October 18, 2025 18:16

pcdubs force-pushed the commit-meta branch from 383fe3b to 174cdb7 Compare October 20, 2025 16:13

pcdubs requested a review from a team as a code owner October 20, 2025 16:13

lzap previously approved these changes Oct 20, 2025

View reviewed changes

achilleas-k previously approved these changes Oct 20, 2025

View reviewed changes

supakeen previously requested changes Oct 21, 2025

View reviewed changes

pcdubs dismissed stale reviews from achilleas-k and lzap via a1acc84 October 21, 2025 15:14

pcdubs force-pushed the commit-meta branch from a1acc84 to b0cf105 Compare October 21, 2025 20:34

pcdubs changed the title ~~iot-commit: Enable bootupd metadata generation~~ Make bootupd metadata generation configurable per distro Oct 22, 2025

pcdubs requested a review from supakeen October 22, 2025 00:16

supakeen force-pushed the commit-meta branch from b0cf105 to e4da2a1 Compare October 23, 2025 08:20

supakeen force-pushed the commit-meta branch from e4da2a1 to 52fc968 Compare October 23, 2025 09:31

supakeen approved these changes Oct 23, 2025

View reviewed changes

supakeen requested review from achilleas-k and lzap October 23, 2025 09:38

lzap approved these changes Oct 23, 2025

View reviewed changes

supakeen added this pull request to the merge queue Oct 23, 2025

Merged via the queue into osbuild:main with commit 6340fa0 Oct 23, 2025
24 checks passed

mcattamoredhat mentioned this pull request Mar 5, 2026

Anaconda fails to install bootloader in centos-stream-9 virt-s1/rhel-edge#11427

Open

Conversation

pcdubs commented Oct 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

supakeen commented Oct 18, 2025

Uh oh!

achilleas-k left a comment

Choose a reason for hiding this comment

Uh oh!

supakeen commented Oct 21, 2025

Uh oh!

supakeen left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pcdubs commented Oct 22, 2025

Uh oh!

supakeen commented Oct 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

say-paul commented Oct 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

supakeen commented Oct 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

say-paul commented Oct 23, 2025

Uh oh!

supakeen commented Oct 23, 2025

Uh oh!

supakeen commented Oct 23, 2025

Uh oh!

lzap left a comment

Choose a reason for hiding this comment

Uh oh!

lzap Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

pcdubs commented Oct 17, 2025 •

edited

Loading

supakeen left a comment •

edited

Loading

supakeen commented Oct 22, 2025 •

edited

Loading

say-paul commented Oct 23, 2025 •

edited

Loading

supakeen commented Oct 23, 2025 •

edited

Loading