From 2d03b8320b0c08c9cedf106beeff9619f8c1fbff Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jonmattgray@gmail.com>
Date: Wed, 20 Mar 2024 15:47:55 +0000
Subject: [PATCH 1/3] use pot copy out

---
 config.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config.sh b/config.sh
index 4f18cf6..6042def 100755
--- a/config.sh
+++ b/config.sh
@@ -37,6 +37,4 @@ RUNNER_FLAVOURS="github-act-configure ${RUNNER_FLAVOURS}"
 . ${SCRIPTDIR}/create-runner.sh
 
 # Copy the configuration out of the jail.
-# FIXME: pot does not provide any mechanism for doing this that doesn't involve
-# poking at its internals.  If one is added then we should use it.
-cp ${POT_MOUNT_BASE}/jails/${POTNAME}/m/root/runner/* ${RUNNER_CONFIG_DIRECTORY}
+pot-copy-out -p "${POTNAME}" -s "/root/runner/*" -d "${RUNNER_CONFIG_DIRECTORY}"

From 8737167f1bf812425844e5630ecc932ce022d23c Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jonmattgray@gmail.com>
Date: Wed, 20 Mar 2024 17:41:35 +0000
Subject: [PATCH 2/3] pot copy-out

---
 config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.sh b/config.sh
index 6042def..8eea44f 100755
--- a/config.sh
+++ b/config.sh
@@ -37,4 +37,4 @@ RUNNER_FLAVOURS="github-act-configure ${RUNNER_FLAVOURS}"
 . ${SCRIPTDIR}/create-runner.sh
 
 # Copy the configuration out of the jail.
-pot-copy-out -p "${POTNAME}" -s "/root/runner/*" -d "${RUNNER_CONFIG_DIRECTORY}"
+pot copy-out -p "${POTNAME}" -s "/root/runner/*" -d "${RUNNER_CONFIG_DIRECTORY}"

From a8971df8d1e4e9d4886b0d8936365afa54f4d650 Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jonmattgray@gmail.com>
Date: Fri, 22 Mar 2024 11:59:56 +0000
Subject: [PATCH 3/3] Update config.sh

Co-authored-by: Elise Haldane <107867060+elisehaldane@users.noreply.github.com>
---
 config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.sh b/config.sh
index cf867e2..277301a 100755
--- a/config.sh
+++ b/config.sh
@@ -39,4 +39,4 @@ RUNNER_FLAVOURS="github-act-configure ${RUNNER_FLAVOURS}"
 . ${SCRIPTDIR}/create-runner.sh
 
 # Copy the configuration out of the jail.
-pot copy-out -p "${POTNAME}" -s "/root/runner/*" -d "${RUNNER_CONFIG_DIRECTORY}"
+pot copy-out -p "${POTNAME}" -s "/root/runner/settings.json" -d "${RUNNER_CONFIG_DIRECTORY}"