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

Makefile: Use 'command -v selinuxenabled' instead of hard-coded path #1363

Merged
merged 1 commit into from
Feb 22, 2018

Conversation

wking
Copy link
Contributor

@wking wking commented Feb 22, 2018

The hard-coded path landed in 488216f (#154), but there's no need to require that path. Using command -v (in POSIX) supports anyone who has selinuxenabled in their PATH.

The hard-coded path landed in 488216f (Make sure selinuxenabled
exists before executing it, 2016-10-17, cri-o#154), but there's no need to
require that path.  Using 'command -v' (in POSIX [1]) supports anyone
who has selinuxenabled in their PATH.

[1]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html

Signed-off-by: W. Trevor King <wking@tremily.us>
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 22, 2018
@openshift-ci-robot
Copy link

Hi @wking. Thanks for your PR.

I'm waiting for a openshift or kubernetes-incubator member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Feb 22, 2018
Copy link
Member

@mrunalp mrunalp left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@TomSweeneyRedHat TomSweeneyRedHat left a comment

Choose a reason for hiding this comment

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

LGTM

@rhatdan
Copy link
Contributor

rhatdan commented Feb 22, 2018

I think this can be merged without running E2E test.
LGTM

@mrunalp mrunalp merged commit 33f6619 into cri-o:master Feb 22, 2018
@wking wking deleted the do-not-hardcode-selinuxenabled-path branch February 23, 2018 00:12
runcom added a commit to runcom/ocid-1 that referenced this pull request Feb 23, 2018
This patch fixes selinuxopt generation as found in:

```
install /usr/sbin/selinuxenabled -D -m 644 crio.conf /etc/crio/crio.conf
```

The above is clearly wrong when installing the configuration because
`commmand -v` outputs the path of selinuxenabled as well, resulting in

/usr/bin/selinuxenabled -Z

This patch fixes that by just echoing the -Z as needed.

Issue introduced in
cri-o#1363

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
@runcom
Copy link
Member

runcom commented Feb 23, 2018

Nack, this has broken docker hub CD

@runcom
Copy link
Member

runcom commented Feb 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants