This repository has been archived by the owner on May 24, 2024. It is now read-only.
basic-fixes: Tweak /usr/lib/tmpfiles.d/provision.conf
#371
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
This ensures that systemd's creation of `/root` works instead of falling back to what we have in `/usr/lib/tmpfiles.d/rpm-ostree-0-integration.conf` for `d /var/roothome 0700 root root -` which in turn ensures that both the credential values as well as bootc's injection of a tmpfiles.d snippet for root SSH key works. containers/bootc#358 Signed-off-by: Colin Walters <[email protected]>
cgwalters
force-pushed
the
fix-root-ssh
branch
from
99dab23
to
1688a6f
Compare
jeckersb
approved these changes
Feb 28, 2024
There was a problem hiding this comment.
LGTM. I kinda wish we could just drop another file into tmpfiles.d to override this instead of assuming the contents will always be present in provision.conf as provided by systemd, but it looks like systemd-tmpfiles doesn't necessarily handle duplicate entries for a given path well, and overrides is not really the intention. So this is a fair compromise.
|
(Also, looks like I can't approve things on this repo) |
|
@lmilbaum hitting some pain here from not having people have approval rights |
lmilbaum
approved these changes
Feb 29, 2024
mvo5
added a commit
to mvo5/centos-bootc
that referenced
this pull request
Mar 18, 2024
As a followup for CentOS#371 this PR tweaks `tmpfiles.d/rpm-ostree-0-integration.conf` too so that there is only a single /var/roothome line for tmpfiles.d. This should fix containers/bootc#358
mvo5
added a commit
to mvo5/centos-bootc
that referenced
this pull request
Mar 18, 2024
As a followup for CentOS#371 this PR tweaks `tmpfiles.d/rpm-ostree-0-integration.conf` too so that there is only a single /var/roothome line for tmpfiles.d. This should fix containers/bootc#358
mvo5
added a commit
to mvo5/centos-bootc
that referenced
this pull request
Mar 18, 2024
As a followup for CentOS#371 this PR tweaks `tmpfiles.d/rpm-ostree-0-integration.conf` too so that there is only a single /var/roothome line for tmpfiles.d. This should fix containers/bootc#358
mvo5
added a commit
to mvo5/centos-bootc
that referenced
this pull request
Mar 18, 2024
As a followup for CentOS#371 this PR tweaks `tmpfiles.d/provision.conf` so that there is only a single /var/roothome line for tmpfiles.d As it is both provision.conf and rpm-ostree-0-integration.conf define the same dir. This should fix containers/bootc#358
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 ensures that systemd's creation of
/rootworks instead of falling back to what we have in/usr/lib/tmpfiles.d/rpm-ostree-0-integration.confford /var/roothome 0700 root root -which in turn ensures that both the credential values as well as bootc's injection of a tmpfiles.d snippet for root SSH key works.containers/bootc#358