prepare-root: Fix composefs + ostree admin unlock --hotfix compat #3129
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
There's a test case for `ostree admin unlock --hotfix` that runs in FCOS, not here; it breaks when enabling composefs. The reason is because the composefs is mounted readonly, and we tried to remount it writable. Instead of trying to remount the rootfs writable at this point forcibly, honor the *real* sysroot readonly state flag from the underlying FS before we mounted the composefs. Note that in FCOS derivatives we always have the root mounted writable via `rw` on the kernel cmdline and this is the default general expectation now with ostree usage.
github-actions
bot
added
the
area/prepare-root
Merged
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.
There's a test case for
ostree admin unlock --hotfixthat runs in FCOS, not here; it breaks when enabling composefs.The reason is because the composefs is mounted readonly, and we tried to remount it writable. Instead of trying to remount the rootfs writable at this point forcibly, honor the real sysroot readonly state flag from the underlying FS before we mounted the composefs.
Note that in FCOS derivatives we always have the root mounted writable via
rwon the kernel cmdline and this is the default general expectation now with ostree usage.