Skip to content

Commit 109428d

Browse files
authored
Merge pull request #1705 from bluca/upstream_sysusers
Install sysusers.d config file for rdma system group
2 parents e5608da + 6b3416e commit 109428d

5 files changed

Lines changed: 17 additions & 0 deletions

File tree

CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,19 @@ find_package(Systemd)
553553
include_directories(${SYSTEMD_INCLUDE_DIRS})
554554
RDMA_DoFixup("${SYSTEMD_FOUND}" "systemd/sd-daemon.h")
555555

556+
# https://www.freedesktop.org/software/systemd/man/latest/sysusers.d.html
557+
set(SYSUSERS_DIR "")
558+
if (NOT ${CMAKE_VERSION} VERSION_LESS "3.4")
559+
pkg_check_modules(SYSTEMD_PC systemd QUIET)
560+
if (SYSTEMD_PC_FOUND)
561+
pkg_get_variable(SYSUSERS_DIR systemd sysusersdir)
562+
endif()
563+
endif()
564+
if ("${SYSUSERS_DIR}" STREQUAL "")
565+
set(SYSUSERS_DIR "/usr/lib/sysusers.d")
566+
endif()
567+
install(FILES rdma-sysusers.conf DESTINATION "${SYSUSERS_DIR}" RENAME rdma.conf)
568+
556569
# drm headers
557570

558571
# Check if the headers have been installed by kernel-headers

debian/libibverbs1.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
usr/lib/*/libibverbs*.so.*
2+
usr/lib/sysusers.d/rdma.conf
23
usr/share/doc/rdma-core/libibverbs.md usr/share/doc/libibverbs1/

rdma-sysusers.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
g rdma

redhat/rdma-core.spec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,7 @@ fi
604604
%{_libdir}/libmlx4.so.*
605605
%config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver
606606
%doc %{_docdir}/%{name}/libibverbs.md
607+
%{_prefix}/lib/sysusers.d/rdma.conf
607608

608609
%files -n libibverbs-utils
609610
%{_bindir}/ibv_*

suse/rdma-core.spec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,7 @@ done
724724
%doc %{_docdir}/%{name}-%{version}/rxe.md
725725
%doc %{_docdir}/%{name}-%{version}/tag_matching.md
726726
%{_mandir}/man7/rxe*
727+
%{_prefix}/lib/sysusers.d/rdma.conf
727728

728729
%files -n libibnetdisc%{ibnetdisc_major}
729730
%{_libdir}/libibnetdisc.so.*

0 commit comments

Comments
 (0)