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.

Sign up for GitHub

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

Jump to bottom

config: look user id instead of rootless #1157

Merged
merged 1 commit into from
Sep 16, 2022
Merged

config: look user id instead of rootless #1157

merged 1 commit into from
Sep 16, 2022

Conversation

giuseppe
Copy link
Member

Change the check to look for the UID to decide whether to load the default configuration files from the user directory instead of the system path.

Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com

@giuseppe
config: look user id instead of rootless
52108b7 
Change the check to look for the UID to decide whether to load the
default configuration files from the user directory instead of the
system path.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@rhatdan
Copy link
Member

rhatdan commented Sep 16, 2022

Makes sense
LGTM
@vrothberg @nalind @flouthoc @baude @mheon PTAL

@giuseppe
Copy link
Member Author

I am trying to vendor it in buildah here: containers/buildah#4253

@nalind
Copy link
Member

nalind commented Sep 16, 2022

Are there other callers of unshare.IsRootless() that are going to need to stop using it as well?

@giuseppe
Copy link
Member Author

I've looked at the other users and it seems to me they make sense with unshare.IsRootless() as the features depend on the capabilities not the config files

@giuseppe
Copy link
Member Author

Buildah CI passes after this fix is included

flouthoc
flouthoc approved these changes Sep 16, 2022
View reviewed changes
Copy link
Collaborator

@flouthoc flouthoc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 16, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, 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

@flouthoc
Copy link
Collaborator

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 16, 2022
@openshift-merge-robot openshift-merge-robot merged commit fd150ee into containers:main Sep 16, 2022
This was referenced Sep 16, 2022
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flouthoc flouthoc flouthoc approved these changes

Assignees

@flouthoc flouthoc

Labels
approved lgtm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@giuseppe @rhatdan @nalind @flouthoc @openshift-merge-robot