set sysroot.bootprefix true in OSTree config #3718
Merged
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
dustymabe
force-pushed
the
dusty-bootprefix
branch
from
c17b646
to
3237fd7
Compare
jlebon
previously approved these changes
Feb 6, 2024
|
Note BTW the upstream default will change in ostreedev/ostree#3156, which would make adding a knob unnecessary. (Unless it's to set it to false though then maybe the description should be updated.) |
+1 |
This setting will make it so that BLS config entries get prepended with /boot. OSTree already places a boot -> . symlink in the root of the boot filesystem prepending with /boot will always just work. For context see osbuild/osbuild#1566 (comment) This also allows for dropping one of the upstream OSBuild zipl stage patches.
org.osbuild.mkdir takes in a number (base 10) and not octal so we need to convert from octal to a number. I realized that the /boot/efi directory needed to also be `0o755` so update that one too.
Addition of platforms.json was originally added in 410cf90. Here we make a few improvements: - We don't need to export platforms_json has that wasn't being done before 410cf90. - We need to only create a file that gets included in the OSTree or Container if there are platforms.yaml entries for that arch. So we modify it here to create "${platforms_json}.all" first and only write to "${platforms_json}" inside the if condition. This makes it so s390x won't get a platforms.json file, which is what we want. - We need to create these files in directories scoped to individual processes. i.e. if `cosa buildextend-metal` and `cosa buildextend-metal4k` run at the same time creating these files shouldn't race.
There are no platforms.yaml entries on that platform so we don't create a platforms.json file inside the OSTree and we we shouldn't try to copy the file.
dustymabe
force-pushed
the
dusty-bootprefix
branch
from
1828d46
to
0c9f5f7
Compare
|
added a few more commits here to fix a problem recently introduced. |
jlebon
approved these changes
Feb 6, 2024
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.
This setting will make it so that BLS config entries get prepended with /boot. OSTree already places a boot -> . symlink in the root of the boot filesystem prepending with /boot will always just work.
For context see osbuild/osbuild#1566 (comment)
This also allows for dropping one of the upstream OSBuild zipl stage patches.