From c46fa45f6db1b6460500dfd04ca7cf4754125579 Mon Sep 17 00:00:00 2001 From: Jason Gunthorpe Date: Thu, 27 Jul 2017 12:41:30 -0600 Subject: [PATCH] Make /etc/modprobe.d/mlx4.conf common Move it out of the redhat directory and into providers/mlx4, this follows the existing pattern of truescale.conf. Signed-off-by: Jason Gunthorpe --- debian/rdma-core.install | 1 + providers/mlx4/CMakeLists.txt | 2 ++ redhat/rdma.mlx4.user.modprobe => providers/mlx4/mlx4.conf | 0 redhat/rdma-core.spec | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) rename redhat/rdma.mlx4.user.modprobe => providers/mlx4/mlx4.conf (100%) diff --git a/debian/rdma-core.install b/debian/rdma-core.install index 26a7c42d0..0b35ab637 100644 --- a/debian/rdma-core.install +++ b/debian/rdma-core.install @@ -1,3 +1,4 @@ +etc/modprobe.d/mlx4.conf etc/modprobe.d/truescale.conf lib/systemd/system/rdma-ndd.service lib/udev/rules.d/60-rdma-ndd.rules diff --git a/providers/mlx4/CMakeLists.txt b/providers/mlx4/CMakeLists.txt index f6739d2dd..2cd668cbb 100644 --- a/providers/mlx4/CMakeLists.txt +++ b/providers/mlx4/CMakeLists.txt @@ -12,3 +12,5 @@ rdma_shared_provider(mlx4 libmlx4.map publish_headers(infiniband mlx4dv.h ) + +install(FILES "mlx4.conf" DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/modprobe.d/") diff --git a/redhat/rdma.mlx4.user.modprobe b/providers/mlx4/mlx4.conf similarity index 100% rename from redhat/rdma.mlx4.user.modprobe rename to providers/mlx4/mlx4.conf diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec index 2437b5090..4413418ff 100644 --- a/redhat/rdma-core.spec +++ b/redhat/rdma-core.spec @@ -257,7 +257,6 @@ install -D -m0755 redhat/rdma.ifup-ib %{buildroot}/%{_sysconfdir}/sysconfig/netw install -D -m0755 redhat/rdma.ifdown-ib %{buildroot}/%{_sysconfdir}/sysconfig/network-scripts/ifdown-ib install -D -m0644 redhat/rdma.service %{buildroot}%{_unitdir}/rdma.service install -D -m0644 redhat/rdma.udev-ipoib-naming.rules %{buildroot}%{_sysconfdir}/udev/rules.d/70-persistent-ipoib.rules -install -D -m0644 redhat/rdma.mlx4.user.modprobe %{buildroot}%{_sysconfdir}/modprobe.d/mlx4.conf install -D -m0755 redhat/rdma.modules-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh install -D -m0644 redhat/rdma.udev-rules %{buildroot}%{_udevrulesdir}/98-rdma.rules install -D -m0644 redhat/rdma.mlx4.sys.modprobe %{buildroot}%{sysmodprobedir}/libmlx4.conf