Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/Explanation/Trident-ACL-Agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions packaging/rpm/trident.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
bfjelds marked this conversation as resolved.
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

# ------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions scripts/extract-binary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading