From 82bbffd17c6e1cbf23461c79b5371ce787eb1608 Mon Sep 17 00:00:00 2001
From: Brian Fjeldstad <bfjelds@microsoft.com>
Date: Fri, 28 Aug 2026 17:57:12 +0000
Subject: [PATCH 1/4] packaging: rename trident-acl-agent subpackage to
 trident-acl

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 packaging/rpm/trident.spec | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packaging/rpm/trident.spec b/packaging/rpm/trident.spec
index ff4bc6fdc..1e4ecd756 100644
--- a/packaging/rpm/trident.spec
+++ b/packaging/rpm/trident.spec
@@ -226,25 +226,25 @@ be removed once the fix is merged in AZL 4.0.
 
 # ------------------------------------------------------------------------------
 
-%package acl-agent
+%package acl
 Summary:        Trident ACL Agent
 Requires:       %{name} = %{version}-%{release}
 
-%description acl-agent
+%description acl
 The Trident ACL Agent triggers updates of ACL images.
 
-%files acl-agent
+%files acl
 %license LICENSE NOTICE
 %{_bindir}/%{name}-acl-agent
 %{_unitdir}/%{name}-acl-agent.service
 
-%post acl-agent
+%post acl
 %systemd_post %{name}-acl-agent.service
 
-%preun acl-agent
+%preun acl
 %systemd_preun %{name}-acl-agent.service
 
-%postun acl-agent
+%postun acl
 %systemd_postun_with_restart %{name}-acl-agent.service
 
 # ------------------------------------------------------------------------------

From 6ffa0fad5ea81c4f8f64adb295bfe848adb22d37 Mon Sep 17 00:00:00 2001
From: Brian Fjeldstad <bfjelds@microsoft.com>
Date: Fri, 28 Aug 2026 18:01:11 +0000
Subject: [PATCH 2/4] packaging: update RPM subpackage references after
 trident-acl rename

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 docs/Explanation/Trident-ACL-Agent.md | 4 ++--
 scripts/extract-binary.sh             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/Explanation/Trident-ACL-Agent.md b/docs/Explanation/Trident-ACL-Agent.md
index d92f9d704..57b9e4b32 100644
--- a/docs/Explanation/Trident-ACL-Agent.md
+++ b/docs/Explanation/Trident-ACL-Agent.md
@@ -13,12 +13,12 @@ distribution and honors the agent's per-node protocol.
 
 ## Deployment
 
-`trident-acl-agent` ships as its own `trident-acl-agent` RPM subpackage
+`trident-acl-agent` ships as its own `trident-acl` RPM subpackage
 (built alongside, and `Requires:` the same version of, the main `trident`
 package). Installing it:
 
 ```console
-$ tdnf install trident-acl-agent
+$ tdnf install trident-acl
 ```
 
 lays down the `/usr/bin/trident-acl-agent` binary and its
diff --git a/scripts/extract-binary.sh b/scripts/extract-binary.sh
index 5d89d25d2..a6a836910 100755
--- a/scripts/extract-binary.sh
+++ b/scripts/extract-binary.sh
@@ -51,8 +51,8 @@ popd
 mkdir -p "$OUTPUT_PATH"
 mv "$TMP_DIR/usr/bin/trident" "$OUTPUT_PATH"
 
-# Extract trident-acl-agent binary from the acl-agent sub-package RPM
-ACL_AGENT_RPM=$(find "$RPM_DIR" | grep -P "trident-acl-agent-\d.*\.${DISTRO}\.${RPM_ARCH}\.rpm" | head -n 1 || true)
+# Extract trident-acl-agent binary from the acl sub-package RPM
+ACL_AGENT_RPM=$(find "$RPM_DIR" | grep -P "trident-acl-\d.*\.${DISTRO}\.${RPM_ARCH}\.rpm" | head -n 1 || true)
 if [ -n "$ACL_AGENT_RPM" ]; then
   ACL_TMP_DIR=$(mktemp -d)
   cp "$ACL_AGENT_RPM" "$ACL_TMP_DIR/trident-acl-agent.rpm"

From 411f1d028118ee271f0fe3b2072af8a1e4f90985 Mon Sep 17 00:00:00 2001
From: Brian Fjeldstad <bfjelds@microsoft.com>
Date: Fri, 28 Aug 2026 18:01:42 +0000
Subject: [PATCH 3/4] packaging: update trident-acl subpackage
 Summary/description

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 packaging/rpm/trident.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/rpm/trident.spec b/packaging/rpm/trident.spec
index 1e4ecd756..9743a1987 100644
--- a/packaging/rpm/trident.spec
+++ b/packaging/rpm/trident.spec
@@ -227,11 +227,11 @@ be removed once the fix is merged in AZL 4.0.
 # ------------------------------------------------------------------------------
 
 %package acl
-Summary:        Trident ACL Agent
+Summary:        Trident ACL Components
 Requires:       %{name} = %{version}-%{release}
 
 %description acl
-The Trident ACL Agent triggers updates of ACL images.
+The Trident ACL components required to orchestrate servicing of ACL images.
 
 %files acl
 %license LICENSE NOTICE

From d0c4391838f03a93c648b9069128ff2e99673335 Mon Sep 17 00:00:00 2001
From: Brian Fjeldstad <bfjelds@microsoft.com>
Date: Fri, 28 Aug 2026 18:02:31 +0000
Subject: [PATCH 4/4] docs: reword trident-acl subpackage phrasing

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 docs/Explanation/Trident-ACL-Agent.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Explanation/Trident-ACL-Agent.md b/docs/Explanation/Trident-ACL-Agent.md
index 57b9e4b32..b48c2bee7 100644
--- a/docs/Explanation/Trident-ACL-Agent.md
+++ b/docs/Explanation/Trident-ACL-Agent.md
@@ -13,7 +13,7 @@ distribution and honors the agent's per-node protocol.
 
 ## Deployment
 
-`trident-acl-agent` ships as its own `trident-acl` RPM subpackage
+`trident-acl-agent` ships in the `trident-acl` RPM subpackage
 (built alongside, and `Requires:` the same version of, the main `trident`
 package). Installing it: