vendor container-libs with storage.conf rework#28194
Merged
mtrmac merged 6 commits intocontainers:mainfrom Mar 20, 2026
Merged
Conversation
github-actions
bot
added
machine
kind/api-change
|
[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore. |
Member
Author
|
/packit test github.com/containers/container-libs#680 |
Member
Author
|
/packit test containers/container-libs#680 |
Luap99
force-pushed
the
storage-conf
branch
3 times, most recently
from
54c6a67 to
c3fcd8e
Compare
Member
Author
|
/packit test containers/container-libs#680 |
Luap99
added
the
bloat_approved
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
It hard codes a graphroot which is not correct for rootless users based on our new config file parsing. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
We no longer generate a warning for an empty driver in storage.conf so remove that. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
We no longer generate a warning for an empty driver in storage.conf so remove that. Also update the test to use CONTAINERS_STORAGE_CONF_OVERRIDE instead to just add a single setting there. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Rootless users cannot use composefs so we need to set it up in the storage.rootful.conf.d/ directory so only the rootful podman reads this file. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
It is not really needed as the storage options are overriden via the cli anyway and the older podman does not like that the new file has explicit runroot set. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Luap99
changed the title
Luap99
removed
the
bloat_approved
Member
Author
|
@containers/podman-maintainers PTAL |
Member
|
LGTM |
mtrmac
reviewed
Mar 20, 2026
|
|
||
| # Remove packaged storage.conf as it hard codes a graphroot which | ||
| # is not correct for rootless users based on our new config file parsing. | ||
| rm -f /usr/share/containers/storage.conf |
Contributor
There was a problem hiding this comment.
Hum, we are creating /etc/containers/storage.conf below. How can the file in /usr still be loaded, with the new semantics?
Member
Author
There was a problem hiding this comment.
yeah I guess I can drop this
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
see containers/container-libs#680 and commit here
Does this PR introduce a user-facing change?