sysroot: Turn on bootloader-naming-2 by default#3206
Merged
ericcurtin merged 1 commit intoostreedev:mainfrom Mar 7, 2024
Merged
sysroot: Turn on bootloader-naming-2 by default#3206ericcurtin merged 1 commit intoostreedev:mainfrom
ericcurtin merged 1 commit intoostreedev:mainfrom
Conversation
I think it's about time we flipped this on by default; like the bootprefix I was a bit too chicken. We still have a `bootloader-naming-1` that can be flipped on in case of some regression. Closes: ostreedev#2961
ericcurtin
approved these changes
Feb 28, 2024
Collaborator
ericcurtin
left a comment
There was a problem hiding this comment.
This LGTM, although I am only familiar with grub BLS-style OSTree and the Android Bootloader variant.
I have wondered this in the past, do we rely on more the filename for versioning or the version number in the files, it didn't seem 100% clear when I read the code to determine that. I wonder should we document what the actual index is.
HuijingHei
added a commit
to HuijingHei/rpm-ostree
that referenced
this pull request
Apr 2, 2024
HuijingHei
added a commit
to HuijingHei/rpm-ostree
that referenced
this pull request
Apr 2, 2024
jlebon
added a commit
to jlebon/fedora-coreos-config
that referenced
this pull request
Apr 11, 2024
We don't have to be super strict here in how we find the bootloader entry. There should only be one, so simplify the logic using a glob instead. Motivated by the fact that this will break otherwise as part of openshift/os#1445 where the `ID` will be `centos`, but the stateroot will still be `scos`. (cherry picked from commit 476a371) --- Also now motivated by the fact that this actually fixes the test with new ostree which enables `bootloader-naming-2` by default, which changes the BLS entry name: ostreedev/ostree#3206
jlebon
added a commit
to jlebon/os
that referenced
this pull request
Apr 11, 2024
Just get at the initramfs using a glob instead of trying to parse the BLS. This will work regardless of how the BLS entry is named but assumes that there is only one BLS entry (which should always be the case for these tests). (cherry picked from commit 1841132) --- We're backporting this because a recent rebuild of 4.15 cosa pulled in a new ostree which enables `bootloader-naming-2` by default, which changes the BLS entry name: ostreedev/ostree#3206
jlebon
added a commit
to jlebon/fedora-coreos-config
that referenced
this pull request
Apr 11, 2024
We don't have to be super strict here in how we find the bootloader entry. There should only be one, so simplify the logic using a glob instead. Motivated by the fact that this will break otherwise as part of openshift/os#1445 where the `ID` will be `centos`, but the stateroot will still be `scos`. (cherry picked from commit 476a371) --- We're backporting this because a recent rebuild of 4.15 cosa pulled in a new ostree which enables `bootloader-naming-2` by default, which changes the BLS entry name: ostreedev/ostree#3206
dustymabe
pushed a commit
to coreos/fedora-coreos-config
that referenced
this pull request
Apr 11, 2024
We don't have to be super strict here in how we find the bootloader entry. There should only be one, so simplify the logic using a glob instead. Motivated by the fact that this will break otherwise as part of openshift/os#1445 where the `ID` will be `centos`, but the stateroot will still be `scos`. (cherry picked from commit 476a371) --- We're backporting this because a recent rebuild of 4.15 cosa pulled in a new ostree which enables `bootloader-naming-2` by default, which changes the BLS entry name: ostreedev/ostree#3206
jlebon
added a commit
to coreosbot-releng/os
that referenced
this pull request
Apr 12, 2024
Just get at the initramfs using a glob instead of trying to parse the BLS. This will work regardless of how the BLS entry is named but assumes that there is only one BLS entry (which should always be the case for these tests). (cherry picked from commit 1841132) --- We're backporting this because a recent rebuild of 4.15 cosa pulled in a new ostree which enables `bootloader-naming-2` by default, which changes the BLS entry name: ostreedev/ostree#3206 (cherry picked from commit 72bd4b0)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
I think it's about time we flipped this on by default; like the bootprefix I was a bit too chicken. We still have a
bootloader-naming-1that can be flipped on in case of some regression.Closes: #2961