From 098e37cffb75396a1ed6370dc3b171e3bd036c9d Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Wed, 5 Nov 2025 12:42:58 -0600
Subject: [PATCH] Fixed build host setup script referring to the wrong CFEngine
 policy file path

Ticket: none
Changelog: none
---
 ci/setup-cfengine-build-host.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/ci/setup-cfengine-build-host.sh b/ci/setup-cfengine-build-host.sh
index 36c2da242..cecd21fcc 100755
--- a/ci/setup-cfengine-build-host.sh
+++ b/ci/setup-cfengine-build-host.sh
@@ -216,14 +216,17 @@ tar xf cfengine-masterfiles-"$CFE_VERSION"-1.pkg.tar.gz
 cp -a masterfiles/* /var/cfengine/inputs/
 
 # run three times to ensure all is done
-policy="$(dirname "$0")"/cfengine-build-host-setup.cf
-# just to be sure, make policy read/write for our user only to avoid errors when running
-chmod 600 "$policy"
-/var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee promises.log
-grep -i error: promises.log && exit 1
-/var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee -a promises.log
-grep -i error: promises.log && exit 1
-/var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee -a promises.log
-grep -i error: promises.log && exit 1
+(
+  cd "$thisdir"
+  policy=./cfengine-build-host-setup.cf
+  # just to be sure, make policy read/write for our user only to avoid errors when running
+  chmod 600 "$policy"
+  /var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee promises.log
+  grep -i error: promises.log && exit 1
+  /var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee -a promises.log
+  grep -i error: promises.log && exit 1
+  /var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee -a promises.log
+  grep -i error: promises.log && exit 1
+)
 
 cleanup