From 361f787abe6fd44c5b58bcd3087fba7c7c6a46e1 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Tue, 21 May 2019 11:31:44 -0400 Subject: Cirrus: Add zip package to images Signed-off-by: Chris Evich --- contrib/cirrus/packer/fedora_setup.sh | 3 ++- contrib/cirrus/packer/ubuntu_setup.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'contrib/cirrus/packer') diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index e031129d7..33e240895 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -66,7 +66,8 @@ ooe.sh sudo dnf install -y \ unzip \ vim \ which \ - xz + xz \ + zip install_varlink diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index 56d7f962e..17e274d97 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/contrib/cirrus/packer/ubuntu_setup.sh @@ -86,7 +86,8 @@ ooe.sh sudo -E apt-get -qq install \ socat \ unzip \ vim \ - xz-utils + xz-utils \ + zip echo "Fixing Ubuntu kernel not enabling swap accounting by default" SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/g' -- cgit v1.2.3-54-g00ecf