Add support for installing static grub configs #543

cgwalters · 2023-10-03T18:02:21Z

grub: Support multiple platform files

In practice, just one should be enough but let's expand
in case.

Add support for installing static grub configs

Currently these are duplicated in osbuild and coreos-assembler.
We will aim to deduplicate them here.

Ideally we'd add support for "day 2" updates of these; I started
on a patch for that but it's sadly messy.

This is an incremental improvement.

cgwalters · 2023-10-06T21:26:52Z

OK this is now tested in concert with coreos/coreos-assembler#3631

src/grub2/grub-static.cfg

say-paul · 2023-10-10T11:27:04Z

src/grub2/grub-static-greenboot.cfg

+if [ -n "${boot_counter}" -a "${boot_success}" = "0" ]; then
+  # if countdown has ended, choose to boot rollback deployment,
+  # i.e. default=1 on OSTree-based systems.
+  if  [ "${boot_counter}" = "0" -o "${boot_counter}" = "-1" ]; then


why forcing 0 to be -1 when it can happen with decrement boot_counter automatically , I have seen similar things here , couldn't understand the logic behind this.

I have no idea either, I'm just copying it from the osbuild code.

But actually the more I think about this, the more it feels like the right move actually is to keep these grub drop-ins in ignition.rpm and greenboot.rpm respectively in say /usr/lib/bootupd/grub2-static or so. WDYT?

having it in rpm makes sense, though during the installation process I am not sure how to set that up in grub.cfg , which image builder writes it directly in the config

The higher level direction here is we will switch Image Builder (Edge) to basically run bootupctl backend install instead of owning the bootloader configs and grub installation on its own.

Seems fair.
May not be an appropriate question, still I am going to ask to clear my doubts: Though I dont see many user doing this , but package installed using using rpm installer will require additional bootupctl backend install to be run again to update the bootloader configs?

We don't directly support updating the configs yet.

(In practice of course, it will trivially work to just cp them manually)

This pairs with coreos/bootupd#543 Basically we want bootupd to take care of installing this. Add the config here (where it more closely arguably belongs) so that it can be optionally installed. My proposal for at least the Fedora packaging of Ignition is that we unconditionally depend on bootupd and install this, because there's no one there using Ignition who doesn't want bootupd.

cgwalters · 2023-10-12T13:59:58Z

xref coreos/ignition#1728

This hard requires - coreos/bootupd#543 - coreos/ignition#1728

This ensures that we'll use `/boot/efi` first, which is what is more commonly expected in our current ecosystem.

travier · 2023-10-17T12:49:30Z

Not tested but LGTM.

I would recommend forcing a number-prefixed format for the XY-foo.cfg drop-ins so that we have a strong ordering guarantee for the final config.

Makefile

cgwalters · 2023-10-17T13:10:42Z

I would recommend forcing a number-prefixed format for the XY-foo.cfg drop-ins so that we have a strong ordering guarantee for the final config.

Good catch; I've added sorting. A bit less certain about actually forcing a numeric prefix; just saying they're sorted seems OK for now.

src/grubconfigs.rs

Currently these are duplicated in osbuild and coreos-assembler. We will aim to deduplicate them here. Ideally we'd add support for "day 2" updates of these; I started on a patch for that but it's sadly messy. This is an incremental improvement. Signed-off-by: Colin Walters <walters@verbum.org>

say-paul

Apart from the one general question, LGTM.

jmarrero

lgtm

This pairs with coreos/bootupd#543 Basically we want bootupd to take care of installing this. Add the config here (where it more closely arguably belongs) so that it can be optionally installed. My proposal for at least the Fedora packaging of Ignition is that we unconditionally depend on bootupd and install this, because there's no one there using Ignition who doesn't want bootupd.

This pairs with coreos/bootupd#543 to have bootupd support injecting the greenboot grub logic only if greenboot is installed.

cgwalters · 2023-10-23T19:40:56Z

xref fedora-iot/greenboot#129

bootupd upstream was modified to store default static grub configs and allow for OS integrators to add their own snippets by placing files in /usr/lib/bootupd/grub2-static/configs.d/ [1] When we move to building with osbuild we will start taking advantage of this functionality and calling bootupd with --with-static-configs. Let's go ahead and add our snippets here so they can be leveraged when we start calling bootupd with --with-static-configs. The snippets added here come from the parts of the config currently defined in coreos-assembler that weren't lifted into bootupd [2][3][4]. [1] coreos/bootupd#543 [2] https://github.com/coreos/coreos-assembler/blob/4636b1a5c6dc00b1d6a58b1bfbb199431444336b/src/grub.cfg#L58-L60 [3] https://github.com/coreos/coreos-assembler/blob/4636b1a5c6dc00b1d6a58b1bfbb199431444336b/src/grub.cfg#L71-L85 [4] https://github.com/coreos/coreos-assembler/blob/4636b1a5c6dc00b1d6a58b1bfbb199431444336b/src/grub.cfg#L87-L91

Upstream we are starting to use grub configs that are partially baked into bootupd [1] and partially baked into the image via the OS vendor (in our case a grub2/50_coreos.cfg file [2]). Let's look first to see if grub2/50_coreos.cfg exists when trying to write new console settings before falling back to grub2/grub.cfg. [1] coreos/bootupd#543 [2] coreos/fedora-coreos-config#2769

Upstream we are starting to use grub configs that are partially baked into bootupd [1] and partially baked into the image via the OS vendor (in our case a grub2/30_console.cfg file [2]). Let's look first to see if grub2/30_console.cfg exists when trying to write new console settings before falling back to grub2/grub.cfg. [1] coreos/bootupd#543 [2] coreos/fedora-coreos-config#2769

bootupd upstream was modified to store default static grub configs and allow for OS integrators to add their own snippets by placing files in /usr/lib/bootupd/grub2-static/configs.d/ [1] When we move to building with osbuild we will start taking advantage of this functionality and calling bootupd with --with-static-configs. Let's go ahead and add our snippets here so they can be leveraged when we start calling bootupd with --with-static-configs. The snippets added here come from the parts of the config currently defined in coreos-assembler that weren't lifted into bootupd [2][3][4]. [1] coreos/bootupd#543 [2] https://github.com/coreos/coreos-assembler/blob/4636b1a5c6dc00b1d6a58b1bfbb199431444336b/src/grub.cfg#L58-L60 [3] https://github.com/coreos/coreos-assembler/blob/4636b1a5c6dc00b1d6a58b1bfbb199431444336b/src/grub.cfg#L71-L85 [4] https://github.com/coreos/coreos-assembler/blob/4636b1a5c6dc00b1d6a58b1bfbb199431444336b/src/grub.cfg#L87-L91

bootupd upstream was modified to store default static grub configs and allow for OS integrators to add their own snippets by placing files in /usr/lib/bootupd/grub2-static/configs.d/ [1] When we move to building with osbuild we will start taking advantage of this functionality and calling bootupd with --with-static-configs. Let's go ahead and add our snippets here so they can be leveraged when we start calling bootupd with --with-static-configs. The snippets added here come from the parts of the config currently defined in coreos-assembler that weren't lifted into bootupd [2][3][4]. [1] coreos/bootupd#543 [2] https://github.com/coreos/coreos-assembler/blob/4636b1a5c6dc00b1d6a58b1bfbb199431444336b/src/grub.cfg#L58-L60 [3] https://github.com/coreos/coreos-assembler/blob/4636b1a5c6dc00b1d6a58b1bfbb199431444336b/src/grub.cfg#L71-L85 [4] https://github.com/coreos/coreos-assembler/blob/4636b1a5c6dc00b1d6a58b1bfbb199431444336b/src/grub.cfg#L87-L91 (cherry picked from commit b40f727)

bootupd upstream was modified to store default static grub configs and allow for OS integrators to add their own snippets by placing files in /usr/lib/bootupd/grub2-static/configs.d/ [1] When we move to building with osbuild we will start taking advantage of this functionality and calling bootupd with --with-static-configs. Let's go ahead and add our snippets here so they can be leveraged when we start calling bootupd with --with-static-configs. The snippets added here come from the parts of the config currently defined in coreos-assembler that weren't lifted into bootupd [2][3][4]. [1] coreos/bootupd#543 [2] https://github.com/coreos/coreos-assembler/blob/4636b1a5c6dc00b1d6a58b1bfbb199431444336b/src/grub.cfg#L58-L60 [3] https://github.com/coreos/coreos-assembler/blob/4636b1a5c6dc00b1d6a58b1bfbb199431444336b/src/grub.cfg#L71-L85 [4] https://github.com/coreos/coreos-assembler/blob/4636b1a5c6dc00b1d6a58b1bfbb199431444336b/src/grub.cfg#L87-L91

This pairs with coreos/bootupd#543 to have bootupd support injecting the greenboot grub logic only if greenboot is installed.

cgwalters marked this pull request as draft October 3, 2023 18:02

openshift-ci bot added the do-not-merge/work-in-progress label Oct 3, 2023

cgwalters force-pushed the install-grub-configs-simpler branch 3 times, most recently from 629918d to 8b88e3f Compare October 6, 2023 21:26

cgwalters marked this pull request as ready for review October 6, 2023 21:26

openshift-ci bot removed the do-not-merge/work-in-progress label Oct 6, 2023

cgwalters mentioned this pull request Oct 6, 2023

create_disk: Add bootupd-epoch, hard require new bootupd coreos/coreos-assembler#3631

Closed

say-paul reviewed Oct 10, 2023

View reviewed changes

cgwalters force-pushed the install-grub-configs-simpler branch from 8b88e3f to f9ce09c Compare October 12, 2023 13:59

cgwalters mentioned this pull request Oct 12, 2023

Add optionally-installed grub2 code coreos/ignition#1728

Merged

cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Oct 12, 2023

create_disk: Add bootupd-epoch, hard require new bootupd

ae5352a

This hard requires - coreos/bootupd#543 - coreos/ignition#1728

cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Oct 12, 2023

create_disk: Add bootupd-epoch, hard require new bootupd

ed7fce9

This hard requires - coreos/bootupd#543 - coreos/ignition#1728

efi: Rework mount order

d299ba4

This ensures that we'll use `/boot/efi` first, which is what is more commonly expected in our current ecosystem.

cgwalters force-pushed the install-grub-configs-simpler branch from f9ce09c to c37f0d3 Compare October 16, 2023 19:20

cgwalters mentioned this pull request Oct 17, 2023

efi: Rework mount order #546

Closed

cgwalters requested a review from say-paul October 17, 2023 12:31

travier reviewed Oct 17, 2023

View reviewed changes

Makefile Outdated Show resolved Hide resolved

cgwalters force-pushed the install-grub-configs-simpler branch 2 times, most recently from fcf0dab to 45fe1ae Compare October 17, 2023 13:10

cgwalters enabled auto-merge October 17, 2023 13:20

say-paul reviewed Oct 18, 2023

View reviewed changes

src/grubconfigs.rs Outdated Show resolved Hide resolved

cgwalters force-pushed the install-grub-configs-simpler branch from 45fe1ae to 1475f25 Compare October 18, 2023 12:55

say-paul mentioned this pull request Oct 18, 2023

Explore bootloader configs within the scope of the repository fedora-iot/greenboot#127

Open

say-paul approved these changes Oct 18, 2023

View reviewed changes

jmarrero approved these changes Oct 19, 2023

View reviewed changes

cgwalters merged commit 66735ba into coreos:main Oct 19, 2023
6 checks passed

cgwalters added a commit to cgwalters/greenboot that referenced this pull request Oct 23, 2023

Add static grub config

f323d5f

This pairs with coreos/bootupd#543 to have bootupd support injecting the greenboot grub logic only if greenboot is installed.

cgwalters mentioned this pull request Oct 23, 2023

Add static grub config fedora-iot/greenboot#129

Merged

dustymabe mentioned this pull request Dec 15, 2023

overlay.d: add 40grub overlay coreos/fedora-coreos-config#2769

Merged

dustymabe mentioned this pull request Dec 15, 2023

install: support grub2/30_console.cfg for console replacement coreos/coreos-installer#1360

Merged

dustymabe mentioned this pull request Jan 5, 2024

[rhcos-4.15] overlay.d: add 40grub overlay coreos/fedora-coreos-config#2787

Merged

vkrizan mentioned this pull request Apr 4, 2024

bootupd integration containers/bootc#456

Open

djach7 pushed a commit to djach7/greenboot that referenced this pull request Apr 9, 2024

Add static grub config

31354ab

This pairs with coreos/bootupd#543 to have bootupd support injecting the greenboot grub logic only if greenboot is installed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for installing static grub configs #543

Add support for installing static grub configs #543

cgwalters commented Oct 3, 2023

cgwalters commented Oct 6, 2023

say-paul Oct 10, 2023

cgwalters Oct 10, 2023

say-paul Oct 11, 2023 •

edited

Loading

cgwalters Oct 11, 2023

say-paul Oct 18, 2023 •

edited

Loading

cgwalters Oct 23, 2023

cgwalters commented Oct 12, 2023

travier commented Oct 17, 2023 •

edited

Loading

cgwalters commented Oct 17, 2023

say-paul left a comment •

edited

Loading

jmarrero left a comment

cgwalters commented Oct 23, 2023

Add support for installing static grub configs #543

Add support for installing static grub configs #543

Conversation

cgwalters commented Oct 3, 2023

cgwalters commented Oct 6, 2023

say-paul Oct 10, 2023

Choose a reason for hiding this comment

cgwalters Oct 10, 2023

Choose a reason for hiding this comment

say-paul Oct 11, 2023 • edited Loading

Choose a reason for hiding this comment

cgwalters Oct 11, 2023

Choose a reason for hiding this comment

say-paul Oct 18, 2023 • edited Loading

Choose a reason for hiding this comment

cgwalters Oct 23, 2023

Choose a reason for hiding this comment

cgwalters commented Oct 12, 2023

travier commented Oct 17, 2023 • edited Loading

cgwalters commented Oct 17, 2023

say-paul left a comment • edited Loading

Choose a reason for hiding this comment

jmarrero left a comment

Choose a reason for hiding this comment

cgwalters commented Oct 23, 2023

say-paul Oct 11, 2023 •

edited

Loading

say-paul Oct 18, 2023 •

edited

Loading

travier commented Oct 17, 2023 •

edited

Loading

say-paul left a comment •

edited

Loading