summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-28 11:25:05 -0700
committerGitHub <noreply@github.com>2019-08-28 11:25:05 -0700
commitced3ebb512e1b578184317e9ff6474f892d1c382 (patch)
tree75f7a0c16895117fae5677cbb8ce84108773b15c /contrib
parent4e209fc10a55560ca181207cf43dae0cb0ec9be0 (diff)
parentca0dfca5c9958c4aa4963f84c69bc425c078a970 (diff)
downloadpodman-ced3ebb512e1b578184317e9ff6474f892d1c382.tar.gz
podman-ced3ebb512e1b578184317e9ff6474f892d1c382.tar.bz2
podman-ced3ebb512e1b578184317e9ff6474f892d1c382.zip
Merge pull request #3728 from mheon/systemd_container_test
Add an integration test for systemd in a container
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 2579229a5..416a96c4e 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -44,11 +44,15 @@ case "${OS_REL_VER}" in
;;
fedora-30) ;& # continue to next item
fedora-29)
+ # All SELinux distros need this for systemd-in-a-container
+ setsebool container_manage_cgroup true
if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then
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"
+ echo "No further setup required for VM image building"
+ # All SELinux distros need this for systemd-in-a-container
+ setsebool container_manage_cgroup true
exit 0
;;
*) bad_os_id_ver ;;