From 4931e0b0a554e52edc638e32bf2f5e4fc75d6f9f Mon Sep 17 00:00:00 2001
From: Andrew Garner <andrew.garner@broadcom.com>
Date: Sun, 1 Mar 2026 21:31:29 -0600
Subject: [PATCH] Move bosh-enable-monit-access helper to /usr/local/sbin

Enables access for legacy bosh-releases that setup monit access via the
monit-access-helper.sh script and may not have executable access to
binaries under /var/vcap/bosh/

Also, adds the "monit-access-helper.sh" pattern from the ubuntu-jammy
branch.
---
 stemcell_builder/stages/bosh_go_agent/apply.sh                | 2 +-
 stemcell_builder/stages/bosh_monit/apply.sh                   | 4 +++-
 .../stages/bosh_monit/assets/monit-access-helper.sh           | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 stemcell_builder/stages/bosh_monit/assets/monit-access-helper.sh

diff --git a/stemcell_builder/stages/bosh_go_agent/apply.sh b/stemcell_builder/stages/bosh_go_agent/apply.sh
index ad7938f02..901455a37 100755
--- a/stemcell_builder/stages/bosh_go_agent/apply.sh
+++ b/stemcell_builder/stages/bosh_go_agent/apply.sh
@@ -17,7 +17,7 @@ bosh_agent_version=$(cat ${assets_dir}/bosh-agent-version)
 /usr/bin/meta4 file-download --metalink=${assets_dir}/metalink.meta4 --file=bosh-agent-${bosh_agent_version}-linux-amd64 bosh-agent
 
 mv bosh-agent $chroot/var/vcap/bosh/bin/
-ln --force $chroot/var/vcap/bosh/bin/bosh-agent $chroot/var/vcap/bosh/etc/bosh-enable-monit-access
+ln --force $chroot/var/vcap/bosh/bin/bosh-agent $chroot/usr/local/sbin/bosh-enable-monit-access
 
 cp $assets_dir/bosh-agent-rc $chroot/var/vcap/bosh/bin/bosh-agent-rc
 
diff --git a/stemcell_builder/stages/bosh_monit/apply.sh b/stemcell_builder/stages/bosh_monit/apply.sh
index 961a9e4fb..0aa2483bd 100755
--- a/stemcell_builder/stages/bosh_monit/apply.sh
+++ b/stemcell_builder/stages/bosh_monit/apply.sh
@@ -31,4 +31,6 @@ mkdir -p $chroot/$bosh_app_dir/monit
 touch $chroot/$bosh_app_dir/monit/empty.monitrc
 
 cp "$(dirname "$0")/assets/monit.service" "${chroot}/lib/systemd/system/"
-run_in_chroot "${chroot}" "systemctl enable monit.service"
\ No newline at end of file
+run_in_chroot "${chroot}" "systemctl enable monit.service"
+
+cp $dir/assets/monit-access-helper.sh $chroot/$bosh_dir/etc/
\ No newline at end of file
diff --git a/stemcell_builder/stages/bosh_monit/assets/monit-access-helper.sh b/stemcell_builder/stages/bosh_monit/assets/monit-access-helper.sh
new file mode 100644
index 000000000..39b944f53
--- /dev/null
+++ b/stemcell_builder/stages/bosh_monit/assets/monit-access-helper.sh
@@ -0,0 +1,3 @@
+permit_monit_access() {
+  /usr/local/sbin/bosh-enable-monit-access
+}
\ No newline at end of file