Prep patches for /opt and /usr/local support
#4763
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
jlebon
force-pushed
the
pr/opt-usrlocal-state-overlays-prep
branch
from
5048485 to
ce848a7
Compare
In a server-side compose, we call `rootfs_prepare_links()` twice: once as part of unified core assembly, and once as part of final postprocessing. In case of the former, all we really want are the `/var` compat symlinks before running scriptlets. Otherwise, let's reduce to a single call the place where we determine the fate of `/usr/local` server-side. And certainly client-side, we shouldn't touch it at all (unless it's part of e.g. some experimental knob that purposely does more invasive things). A follow up to this is to split out `/usr/local` handling entirely into a separate function call, and only call that function in the server-side compose path (and rename `rootfs_prepare_links()` to e.g. `rootfs_prepare_compat_var_symlinks()`).
`systemd-tmpfiles` follows symlinks, so we can write `/usr/local/` here instead of `/var/usrlocal/`. This doesn't matter right now, but will in a future patch where `/usr/local` will no longer be a symlink.
Prep for not always wanting those entries.
|
Hmm, Prow is failing with which is really weird. I see it in the logs getting added to the cosa image: Seems to be working fine in CoreOS CI at least. |
jlebon
force-pushed
the
pr/opt-usrlocal-state-overlays-prep
branch
from
ce848a7 to
4a82e66
Compare
|
Oh right, I think I understand this. Prow is unprivileged so uses supermin for the treecompose. But the new file isn't in the rpmdb so supermin doesn't know to pull it in. CoreOS CI also runs unprivileged, but we build a new rpm-ostree RPM there. |
Until a new rpm-ostree is out with the new `rpm-ostree-0-integration-opt-usrlocal.conf` file and part of cosa. This duplicates the CoreOS CI test anyway. Note we do still put rpm-ostree in the target system we compose and run kola tests on. See coreos#4763 (comment)
jlebon
force-pushed
the
pr/opt-usrlocal-state-overlays-prep
branch
from
4a82e66 to
6ccf858
Compare
|
Overall, LGTM. |
|
Thanks, I restarted CI. It should pass now that #4764 is in. |
cgwalters
approved these changes
Jan 10, 2024
jlebon
added a commit
to jlebon/rpm-ostree
that referenced
this pull request
Feb 6, 2024
Let's match CoreOS CI and also build RPMs here to not fall into issues relating to supermin relying on the rpmdb: coreos#4763 (comment) This implicitly reverts 1451675.
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.
Split out of #4728