diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-12 13:35:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 13:35:15 -0700 |
| commit | 486a1173312279a06836246e26083e7a36cd2591 (patch) | |
| tree | 04f1fbfa11c0c2c35a7035bcdac6aa1e0189275a /contrib/cirrus/setup_environment.sh | |
| parent | 5b4e91db73a80f31f67b7c28832527e64b074b74 (diff) | |
| parent | 440e97c2c06772e90aa3594d96027c05c2700c59 (diff) | |
| download | podman-486a1173312279a06836246e26083e7a36cd2591.tar.gz podman-486a1173312279a06836246e26083e7a36cd2591.tar.bz2 podman-486a1173312279a06836246e26083e7a36cd2591.zip | |
Merge pull request #6196 from mheon/remote_libpod_conf
Remove libpod.conf from repo
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 756240444..945b33909 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -76,12 +76,6 @@ case "$CG_FS_TYPE" in X=$(echo "export OCI_RUNTIME=/usr/bin/crun" | \ tee -a /etc/environment) && eval "$X" && echo "$X" - if [[ "$MOD_LIBPOD_CONF" == "true" ]]; then - warn "Updating runtime setting in repo. copy of libpod.conf" - sed -i -r -e 's/^runtime = "runc"/runtime = "crun"/' $GOSRC/libpod.conf - git diff $GOSRC/libpod.conf - fi - if [[ "$OS_RELEASE_ID" == "fedora" ]]; then warn "Upgrading to the latest crun" # Normally not something to do for stable testing |