From a5e37ad2805b2594339e0d5d41da0e0cc37e4f4a Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Tue, 28 Jul 2020 08:23:45 -0400
Subject: Switch all references to github.com/containers/libpod -> podman

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 contrib/cirrus/packer/xfedora_setup.sh | 35 +++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 contrib/cirrus/packer/xfedora_setup.sh

(limited to 'contrib/cirrus/packer/xfedora_setup.sh')

diff --git a/contrib/cirrus/packer/xfedora_setup.sh b/contrib/cirrus/packer/xfedora_setup.sh
deleted file mode 120000
index 5e9f1ec77..000000000
--- a/contrib/cirrus/packer/xfedora_setup.sh
+++ /dev/null
@@ -1 +0,0 @@
-fedora_setup.sh
\ No newline at end of file
diff --git a/contrib/cirrus/packer/xfedora_setup.sh b/contrib/cirrus/packer/xfedora_setup.sh
new file mode 100644
index 000000000..25b568e8a
--- /dev/null
+++ b/contrib/cirrus/packer/xfedora_setup.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# This script is called by packer on the subject fedora VM, to setup the podman
+# build/test environment.  It's not intended to be used outside of this context.
+
+set -e
+
+# Load in library (copied by packer, before this script was run)
+source $GOSRC/$SCRIPT_BASE/lib.sh
+
+req_env_var SCRIPT_BASE PACKER_BASE INSTALL_AUTOMATION_VERSION PACKER_BUILDER_NAME GOSRC FEDORA_BASE_IMAGE OS_RELEASE_ID OS_RELEASE_VER
+
+workaround_bfq_bug
+
+# Do not enable updates-testing on the previous Fedora release
+if [[ "$PRIOR_FEDORA_BASE_IMAGE" =~ "${OS_RELEASE_ID}-cloud-base-${OS_RELEASE_VER}" ]]; then
+    DISABLE_UPDATES_TESTING=1
+else
+    DISABLE_UPDATES_TESTING=0
+fi
+
+bash $PACKER_BASE/fedora_packaging.sh
+# Load installed environment right now (happens automatically in a new process)
+source /usr/share/automation/environment
+
+echo "Enabling cgroup management from containers"
+ooe.sh sudo setsebool container_manage_cgroup true
+
+# Ensure there are no disruptive periodic services enabled by default in image
+systemd_banish
+
+rh_finalize
+
+echo "SUCCESS!"
-- 
cgit v1.2.3-54-g00ecf