On Fri, Jul 14, 2017 at 03:26:04PM +0200, Benjamin Drung wrote:
> ibacm ships only a sysvinit script but no corresponding systemd unit
> file. The RedHat package ships its own systemd unit file. Thus make it
> available to all.
>
> Signed-off-by: Benjamin Drung <benjamin.drung@xxxxxxxxxxxxxxxx>
> ---
> debian/ibacm.install | 1 +
> ibacm/CMakeLists.txt | 5 +++++
> redhat/ibacm.service => ibacm/ibacm.service.in | 4 ++--
> redhat/rdma-core.spec | 1 -
> 4 files changed, 8 insertions(+), 3 deletions(-)
> rename redhat/ibacm.service => ibacm/ibacm.service.in (63%)
>
> diff --git a/debian/ibacm.install b/debian/ibacm.install
> index c8be4a6f..41cf5bad 100644
> --- a/debian/ibacm.install
> +++ b/debian/ibacm.install
> @@ -1,4 +1,5 @@
> etc/init.d/ibacm
> +lib/systemd/system/ibacm.service
> usr/bin/ib_acme
> usr/include/infiniband/acm.h
> usr/include/infiniband/acm_prov.h
> diff --git a/ibacm/CMakeLists.txt b/ibacm/CMakeLists.txt
> index 7eba294b..5e3ea5e2 100644
> --- a/ibacm/CMakeLists.txt
> +++ b/ibacm/CMakeLists.txt
> @@ -64,3 +64,8 @@ rdma_subst_install(FILES "ibacm.init.in"
> DESTINATION "${CMAKE_INSTALL_INITDDIR}"
> RENAME "ibacm"
> PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
> +
> +rdma_subst_install(FILES "ibacm.service.in"
> + DESTINATION "${CMAKE_INSTALL_SYSTEMD_SERVICEDIR}"
> + RENAME ibacm.service
> + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
> diff --git a/redhat/ibacm.service b/ibacm/ibacm.service.in
> similarity index 63%
> rename from redhat/ibacm.service
> rename to ibacm/ibacm.service.in
> index bb28928c..3879dc45 100644
> --- a/redhat/ibacm.service
> +++ b/ibacm/ibacm.service.in
> @@ -1,12 +1,12 @@
> [Unit]
> Description=Starts the InfiniBand Address Cache Manager daemon
> -Documentation=man:ibacm file:/etc/rdma/ibacm_opts.cfg
> +Documentation=man:ibacm file:@CMAKE_INSTALL_SYSCONFDIR@/rdma/ibacm_opts.cfg
Jason's comment on github:
"We don't have rdma.service in rdma-core, that is a redhat specific target.. It should be stripped out before moving.."
Please resubmit.
Thanks
Attachment:
signature.asc
Description: PGP signature
