diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-12 14:01:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 14:01:05 +0200 |
| commit | 57e093b3aedfdc3fbed50d625b288388fe6e5b1f (patch) | |
| tree | 413e062cfd06b2929976c6dce344dab88d36ea8c | |
| parent | ce31aa37d6ca4762f4a82274452e089024529444 (diff) | |
| parent | 866d4763a16f6e4f072736cced0aa830de79abf5 (diff) | |
| download | podman-57e093b3aedfdc3fbed50d625b288388fe6e5b1f.tar.gz podman-57e093b3aedfdc3fbed50d625b288388fe6e5b1f.tar.bz2 podman-57e093b3aedfdc3fbed50d625b288388fe6e5b1f.zip | |
Merge pull request #3994 from cevich/fix_img_build_sebool
Cirrus: Fix unnecessary setsebool
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 7c7659169..c1a01d6ab 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -50,9 +50,7 @@ case "${OS_REL_VER}" in bash "$SCRIPT_BASE/add_second_partition.sh"; fi ;; centos-7) # Current VM is an image-builder-image no local podman/testing - echo "No further setup required for VM image building" - # All SELinux distros need this for systemd-in-a-container - setsebool container_manage_cgroup true + echo "No further setup required for VM image building" exit 0 ;; *) bad_os_id_ver ;; |