diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-12 21:28:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 21:28:56 +0200 |
| commit | f634fd39001ad3dc62b83e5d78c6912db915a1e9 (patch) | |
| tree | b7f5ad11be24f0d63cc8dd76a978781014a5e788 /contrib/cirrus/packer/fedora_setup.sh | |
| parent | 3cf4567e1dfcf172673694a1171ae18bcbf9c846 (diff) | |
| parent | b843804d51ec3fb747670201b6178896d9a4580d (diff) | |
| download | podman-f634fd39001ad3dc62b83e5d78c6912db915a1e9.tar.gz podman-f634fd39001ad3dc62b83e5d78c6912db915a1e9.tar.bz2 podman-f634fd39001ad3dc62b83e5d78c6912db915a1e9.zip | |
Merge pull request #3607 from cevich/cgroup2_vm
Add another Fedora VM with cgroups v2 enabled
Diffstat (limited to 'contrib/cirrus/packer/fedora_setup.sh')
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index e9b145391..f73df4182 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -8,7 +8,7 @@ set -e # Load in library (copied by packer, before this script was run) source /tmp/libpod/$SCRIPT_BASE/lib.sh -req_env_var SCRIPT_BASE +req_env_var SCRIPT_BASE PACKER_BUILDER_NAME GOSRC install_ooe @@ -85,6 +85,17 @@ systemd_banish sudo /tmp/libpod/hack/install_catatonit.sh +# Same script is used for several related contexts +case "$PACKER_BUILDER_NAME" in + xfedora*) + echo "Configuring CGroups v2 enabled on next boot" + sudo grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=1" + ;& # continue to next matching item + *) + echo "Finalizing $PACKER_BUILDER_NAME VM image" + ;; +esac + rh_finalize echo "SUCCESS!" |