summaryrefslogtreecommitdiff
path: root/contrib/cirrus/packer/ubuntu_setup.sh
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/cirrus/packer/ubuntu_setup.sh')
-rw-r--r--contrib/cirrus/packer/ubuntu_setup.sh15
1 files changed, 7 insertions, 8 deletions
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 46e7a620f..4b6e99358 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -52,6 +52,7 @@ INSTALL_PACKAGES=(\
bash-completion
bison
build-essential
+ buildah
bzip2
conmon
containernetworking-plugins
@@ -145,12 +146,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"
@@ -158,8 +153,6 @@ echo "Installing general testing and system dependencies"
$LILTO $SUDOAPTGET update
$BIGTO $SUDOAPTGET install ${INSTALL_PACKAGES[@]}
-install_buildah_packages
-
echo "Installing cataonit and libseccomp.sudo"
ooe.sh sudo /tmp/libpod/hack/install_catatonit.sh
ooe.sh sudo make -C /tmp/libpod install.libseccomp.sudo
@@ -174,6 +167,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!"