overlay/15fcos: fix aleph file and update bootloader for Secure Boot nodes #3042
Conversation
This file contains 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
jbtrystram
force-pushed
the
fix-bootupd-aleph
branch
from
9bc291e
to
02578f1
Compare
jbtrystram
force-pushed
the
fix-bootupd-aleph
branch
3 times, most recently
from
857c991
to
9ace03e
Compare
travier
changed the title
travier
changed the title
travier
changed the title
travier
previously requested changes
Jun 27, 2024
overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-secureboot.service
Show resolved
Hide resolved
|
secureboot -> Secure Boot |
jlebon
reviewed
Jun 27, 2024
overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-secureboot.service
Outdated
Show resolved
Hide resolved
overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-secureboot.service
Outdated
Show resolved
Hide resolved
overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-secureboot.service
Outdated
Show resolved
Hide resolved
|
In the script, I think let's just have two separate paths entirely for RAID1 and non-RAID1. You can detect if a system is using RAID1 or not by checking if there is a
|
This won´t support RAID-1 with more than two disks though |
jbtrystram
force-pushed
the
fix-bootupd-aleph
branch
5 times, most recently
from
51c42eb
to
2fad4a6
Compare
|
Sorry for the multiples force pushes, I'm getting burn by the trailing whitespaces ! |
jlebon
reviewed
Jun 27, 2024
travier
reviewed
Jun 27, 2024
jbtrystram
force-pushed
the
fix-bootupd-aleph
branch
from
2fad4a6
to
a7347d4
Compare
jlebon
force-pushed
the
fix-bootupd-aleph
branch
3 times, most recently
from
de8c104
to
3379e15
Compare
Due to an ordering mishap, some builds have both a `version` and a `build` field. This causes bootupctl to fail while parsing the file. Detect this case, and fix the aleph if necessary by removing the `build` field. This should be removed after the next barrier release. Fixes: coreos/fedora-coreos-tracker#1724 Co-authored-by: Jonathan Lebon <[email protected]>
The 6.9 kernel won't boot on systems installed prior to F39, as the shim is too old. Add a systemd unit that updates the bootloader on those machines. Manually handle systems with mirrored ESPs. See also: coreos/fedora-coreos-tracker#1752 Fixes: fedora-silverblue/issue-tracker#543 Co-authored-by: Jonathan Lebon <[email protected]>
jlebon
force-pushed
the
fix-bootupd-aleph
branch
from
3379e15
to
8f0bfde
Compare
jlebon
approved these changes
Jun 27, 2024
There was a problem hiding this comment.
Tested this pretty extensively. Secure Boot/non-Secure boot, RAID/non-RAID, old builds, new builds, builds affected by coreos/fedora-coreos-tracker#1724.
LGTM
|
Thanks @jlebon for pushing it through! |
|
👍🏻 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
overlay/15fcos: ensure valid aleph file
Due to an ordering mishap, some builds have both a
versionand abuildfield. This causes bootupctl to fail while parsing the file.Detect this case, and fix the aleph if necessary by removing the
buildfield.
This should be removed after the next barrier release.
Fixes: coreos/fedora-coreos-tracker#1724
overlay/15fcos: upgrade bootloader for Secure Boot-enabled systems
The 6.9 kernel won't boot on systems installed prior to F39, as the shim
is too old.
Add a systemd unit that updates the bootloader on those machines.
Manually handle systems with mirrored ESPs.
See also: coreos/fedora-coreos-tracker#1752
Fixes: fedora-silverblue/issue-tracker#543