diff --git a/docs/Explanation/Trident-ACL-Agent.md b/docs/Explanation/Trident-ACL-Agent.md index d92f9d704..b48c2bee7 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 in the `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/packaging/rpm/trident.spec b/packaging/rpm/trident.spec index ff4bc6fdc..9743a1987 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 -Summary: Trident ACL Agent +%package acl +Summary: Trident ACL Components Requires: %{name} = %{version}-%{release} -%description acl-agent -The Trident ACL Agent triggers updates of ACL images. +%description acl +The Trident ACL components required to orchestrate servicing 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 # ------------------------------------------------------------------------------ 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"