diff options
| author | Chris Evich <cevich@redhat.com> | 2020-02-27 11:43:47 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2020-02-28 10:37:31 -0500 |
| commit | 0885f7674215800286ffb9360d0f9095799419d6 (patch) | |
| tree | 8fb2e9e1cfb7dbd20e62e52f0b540782ddf30c13 /contrib/cirrus/lib.sh | |
| parent | c96eb612e5a1149b8b618dd87c1f81d3c4878e09 (diff) | |
| download | podman-0885f7674215800286ffb9360d0f9095799419d6.tar.gz podman-0885f7674215800286ffb9360d0f9095799419d6.tar.bz2 podman-0885f7674215800286ffb9360d0f9095799419d6.zip | |
Cirrus: Force runc use in F30
Suspect crun might be sneaking in during VM image build via podman RPM
dependency. Add it to the removal list when building, then also force
use of runc at runtime in F30.
Also quote all true/false vars to force them as strings instead of
booleans (which will become capitalized)
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/lib.sh')
| -rw-r--r-- | contrib/cirrus/lib.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 71ad67c74..1ffe554e9 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -88,6 +88,7 @@ ROOTLESS_ENV_RE='(CIRRUS_.+)|(ROOTLESS_.+)|(.+_IMAGE.*)|(.+_BASE)|(.*DIRPATH)|(. SECRET_ENV_RE='(IRCID)|(ACCOUNT)|(GC[EP]..+)|(SSH)' SPECIALMODE="${SPECIALMODE:-none}" +MOD_LIBPOD_CONF="${MOD_LIBPOD_CONF:false}" TEST_REMOTE_CLIENT="${TEST_REMOTE_CLIENT:-false}" export CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-podman} @@ -105,6 +106,8 @@ OS_RELEASE_ID="$(source /etc/os-release; echo $ID)" OS_RELEASE_VER="$(source /etc/os-release; echo $VERSION_ID | cut -d '.' -f 1)" # Combined to ease soe usage OS_REL_VER="${OS_RELEASE_ID}-${OS_RELEASE_VER}" +# Type of filesystem used for cgroups +CG_FS_TYPE="$(stat -f -c %T /sys/fs/cgroup)" # Installed into cache-images, supports overrides # by user-data in case of breakage or for debugging. |