summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2020-03-03 11:43:52 -0500
committerChris Evich <cevich@redhat.com>2020-04-20 14:22:23 -0400
commite282c88d2ce8751f1230ee582072fd51a5d31a7b (patch)
tree42bd89f8ae5edb6c2f4077b2c371e95e232e2b34 /contrib/cirrus
parent06152434e629c86710ca94e075088b89fb26f126 (diff)
downloadpodman-e282c88d2ce8751f1230ee582072fd51a5d31a7b.tar.gz
podman-e282c88d2ce8751f1230ee582072fd51a5d31a7b.tar.bz2
podman-e282c88d2ce8751f1230ee582072fd51a5d31a7b.zip
Cirrus: More Ubuntu 19 + Fedora 31
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus')
-rw-r--r--contrib/cirrus/packer/ubuntu_setup.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 46e7a620f..6bcf7d5f3 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -145,12 +145,6 @@ else
/tmp/$(basename $BATS_URL)
btrfs-tools
)
-
- echo "Forced Ubuntu 18 kernel to enable cgroup swap accounting."
- SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/g'
- ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub.d/*
- ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub
- ooe.sh sudo update-grub
fi
echo "Installing general testing and system dependencies"
@@ -174,6 +168,12 @@ then
sudo ln -f "$CRIO_RUNC_PATH" "/usr/bin/runc"
fi
+echo "Making Ubuntu kernel to enable cgroup swap accounting as it is not the default."
+SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/g'
+ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub.d/*
+ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub
+ooe.sh sudo update-grub
+
ubuntu_finalize
echo "SUCCESS!"