summaryrefslogtreecommitdiff
path: root/contrib/cirrus/packer/ubuntu_setup.sh
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-12 21:28:56 +0200
committerGitHub <noreply@github.com>2019-08-12 21:28:56 +0200
commitf634fd39001ad3dc62b83e5d78c6912db915a1e9 (patch)
treeb7f5ad11be24f0d63cc8dd76a978781014a5e788 /contrib/cirrus/packer/ubuntu_setup.sh
parent3cf4567e1dfcf172673694a1171ae18bcbf9c846 (diff)
parentb843804d51ec3fb747670201b6178896d9a4580d (diff)
downloadpodman-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/ubuntu_setup.sh')
-rw-r--r--contrib/cirrus/packer/ubuntu_setup.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index dba191ad2..4b50d6dc3 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -15,6 +15,9 @@ install_ooe
export GOPATH="$(mktemp -d)"
trap "sudo rm -rf $GOPATH" EXIT
+# Ensure there are no disruptive periodic services enabled by default in image
+systemd_banish
+
echo "Updating/configuring package repositories."
$LILTO $SUDOAPTGET update
$LILTO $SUDOAPTGET install software-properties-common
@@ -100,9 +103,6 @@ ooe.sh sudo update-grub
sudo /tmp/libpod/hack/install_catatonit.sh
ooe.sh sudo make -C /tmp/libpod install.libseccomp.sudo
-# Ensure there are no disruptive periodic services enabled by default in image
-systemd_banish
-
ubuntu_finalize
echo "SUCCESS!"