C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix runc absolute path (#4542)

Browse source 
The BINDIR variable defined on the runc's Makefile[1] defines
installation path is on $(PREFIX)/sbin which used for most of the
Linux distributions. This change fixes the absolute path used for
non-ClearLinux distributions (CentOS, Ubuntu).

[1] https://github.com/opencontainers/runc/blob/master/Makefile#L10
This commit is contained in:
Victor Morales 2019-04-18 15:41:58 -07:00 committed by Kubernetes Prow Robot
parent f92309bfd0
commit f5aec8add4
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/container-engine/cri-o/templates/crio.conf.j2
View file

@ -64,7 +64,11 @@ file_locking = true
# This is a mandatory setting as this runtime will be the default one # This is a mandatory setting as this runtime will be the default one
# and will also be used for untrusted container workloads if # and will also be used for untrusted container workloads if
# runtime_untrusted_workload is not set. # runtime_untrusted_workload is not set.
{% if ansible_os_family == "ClearLinux" %}
runtime = "/usr/bin/runc" runtime = "/usr/bin/runc"
{% else %}
runtime = "/usr/sbin/runc"
{% endif %}
# runtime_untrusted_workload is the OCI compatible runtime used for untrusted # runtime_untrusted_workload is the OCI compatible runtime used for untrusted
# container workloads. This is an optional setting, except if # container workloads. This is an optional setting, except if