Track deployment root/inode from prepare root #3164
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
github-actions
bot
added
the
area/prepare-root
alexlarsson
reviewed
Feb 8, 2024
alexlarsson
reviewed
Feb 8, 2024
cgwalters
force-pushed
the
prepare-root-device-inode
branch
from
314c034
to
aca3f76
Compare
cgwalters
commented
Feb 8, 2024
cgwalters
force-pushed
the
prepare-root-device-inode
branch
from
aca3f76
to
0b16f02
Compare
|
I tried this, but it didn't seem to work: The should have been an asterisk, no? |
alexlarsson
reviewed
Feb 8, 2024
|
I tried it with and it works. |
cgwalters
force-pushed
the
prepare-root-device-inode
branch
from
0b16f02
to
0b6e19d
Compare
cgwalters
changed the title
|
OK I've done some more cleanup, and this definitely works with composefs. Enabling transient etc blocks ssh logins in the current cosa qemu bits...fixing that is going to need some reworking of the test suite. |
alexlarsson
reviewed
Feb 8, 2024
When we added composefs, it broke the logic for detecting the booted deployment which was previously a direct (device, inode) comparison. So the code there started looking at `etc`. However, that in turns breaks with `etc.transient = true` enabled. Fix all of this by tracking the real deployment directory's (device,inode) that we found in `ostree-prepare-root`, and inject it into the extensible metadata we have in `/run/ostree-booted` which is designed exactly to pass state between the initramfs and the real root. Signed-off-by: Colin Walters <[email protected]>
cgwalters
force-pushed
the
prepare-root-device-inode
branch
from
0b6e19d
to
525a57d
Compare
|
OK fixed; we had a green CI though before that at least. Not totally sure about waiting for a full cycle again. |
alexlarsson
approved these changes
Feb 8, 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.
When we added composefs, it broke the logic for detecting the booted
deployment which was previously a direct (device, inode) comparison.
So the code there started looking at
etc. However, that inturns breaks with
etc.transient = trueenabled.Fix all of this by tracking the real deployment directory's
(device,inode) that we found in
ostree-prepare-root, and injectit into the extensible metadata we have in
/run/ostree-bootedwhich is designed exactly to pass state between the initramfs
and the real root.