summaryrefslogtreecommitdiff
path: root/contrib/cirrus/setup_environment.sh
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-22 07:37:14 -0400
committerGitHub <noreply@github.com>2020-04-22 07:37:14 -0400
commit5bbbc9996f215536afee530ddd7f176d2c53c869 (patch)
treee7f072fea0ce6057f699072d0c96149760d11edb /contrib/cirrus/setup_environment.sh
parentea63f7076af6d2ad3213eeccbf30ccce216a830e (diff)
parentd2d9722454240f57ae5084d5a02e564790a9eadf (diff)
downloadpodman-5bbbc9996f215536afee530ddd7f176d2c53c869.tar.gz
podman-5bbbc9996f215536afee530ddd7f176d2c53c869.tar.bz2
podman-5bbbc9996f215536afee530ddd7f176d2c53c869.zip
Merge pull request #5737 from cevich/add_f32
Cirrus: Add support for Fedora 32 beta
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index eceb80b00..57c9ec52a 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -47,10 +47,12 @@ case "${OS_RELEASE_ID}" in
bash "$SCRIPT_BASE/add_second_partition.sh"
fi
- warn "Switching io scheduler to 'deadline' to avoid RHBZ 1767539"
- warn "aka https://bugzilla.kernel.org/show_bug.cgi?id=205447"
- echo "mq-deadline" > /sys/block/sda/queue/scheduler
- cat /sys/block/sda/queue/scheduler
+ if [[ $OS_RELEASE_VER -le 31 ]]; then
+ warn "Switching io scheduler to 'deadline' to avoid RHBZ 1767539"
+ warn "aka https://bugzilla.kernel.org/show_bug.cgi?id=205447"
+ echo "mq-deadline" > /sys/block/sda/queue/scheduler
+ cat /sys/block/sda/queue/scheduler
+ fi
if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then
bash "$SCRIPT_BASE/add_second_partition.sh"