Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rootless: use the correct conf file #3446

Merged
merged 2 commits into from
Jun 27, 2019

Conversation

giuseppe
Copy link
Member

this is to fix a regression introduced with 53c3720

We should not try to use the global configuration when running in rootless but only cherry-pick some settings from there when creating the file for the first time.

giuseppe added 2 commits June 27, 2019 13:52
otherwise it won't work in a user namespace.

Signed-off-by: Giuseppe Scrivano <[email protected]>
we had a regression where the rootless user tried to use the global
configuration file.  We should not try to use the global configuration
when running in rootless but only cherry-pick some settings from there
when creating the file for the first time.

Signed-off-by: Giuseppe Scrivano <[email protected]>
@giuseppe giuseppe requested a review from rhatdan June 27, 2019 12:25
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M labels Jun 27, 2019
@TomSweeneyRedHat
Copy link
Member

LGTM assuming happy tests.

@rhatdan
Copy link
Member

rhatdan commented Jun 27, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 27, 2019
@openshift-merge-robot openshift-merge-robot merged commit 5e3d63a into containers:master Jun 27, 2019
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 26, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants