diff options
| author | Chris Evich <cevich@redhat.com> | 2019-10-11 13:32:50 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2020-02-25 12:34:25 -0500 |
| commit | 614917d6aac58dfc0efd90dbb75411ac8a61821f (patch) | |
| tree | 41a4f48b9fbe91b5f7f3ffca547b919efba764d8 /contrib/cirrus/setup_environment.sh | |
| parent | 70b28bc2cc7b0696adf6b173be797d0f9c91237e (diff) | |
| download | podman-614917d6aac58dfc0efd90dbb75411ac8a61821f.tar.gz podman-614917d6aac58dfc0efd90dbb75411ac8a61821f.tar.bz2 podman-614917d6aac58dfc0efd90dbb75411ac8a61821f.zip | |
Cirrus: Handle runc->crun when both are possible
In some distributions it's possible to have both runc and crun
installed and/or for podman to be confused about which to use. In these
instances, force the decision by adding `OCI_RUNTIME=/usr/bin/crun` into
`/etc/environment`. Also in-place modify libpod.conf to use 'crun'
instead of 'runc'
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 00f625407..de3a806d1 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -54,7 +54,7 @@ case "${OS_RELEASE_ID}" in echo "mq-deadline" > /sys/block/sda/queue/scheduler cat /sys/block/sda/queue/scheduler warn "Testing with crun instead of runc" - X=$(echo "export export OCI_RUNTIME=/usr/bin/crun" | \ + X=$(echo "export OCI_RUNTIME=/usr/bin/crun" | \ tee -a /etc/environment) && eval "$X" && echo "$X" warn "Upgrading to the latest crun" # Normally not something to do for stable testing |