Merge pull request #1643 from jozzsi/1

dracut: unify and improve dracut rdma module

Author: jgunthorpe

kernel-boot/dracut/50rdma/module-setup.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+check() {
+    [ -n "$hostonly" ] && [ -e /sys/class/infiniband_verbs/uverbs0 ] && return 0
+    [ -n "$hostonly" ] && return 255
+    return 0
+}
+
+depends() {
+    echo systemd
+    return 0
+}
+
+install() {
+    inst /etc/rdma/mlx4.conf
+    inst /etc/rdma/modules/infiniband.conf
+    inst /etc/rdma/modules/iwarp.conf
+    inst /etc/rdma/modules/opa.conf
+    inst /etc/rdma/modules/rdma.conf
+    inst /etc/rdma/modules/roce.conf
+    inst /usr/libexec/mlx4-setup.sh
+    inst_multiple lspci setpci awk sleep
+    inst_rules 60-rdma-persistent-naming.rules 70-persistent-ipoib.rules 75-rdma-description.rules 90-rdma-hw-modules.rules 90-rdma-ulp-modules.rules 90-rdma-umad.rules
+    inst_multiple -o \
+        inst /usr/lib/modprobe.d/libmlx4.conf \
+        "$systemdsystemunitdir"/rdma-hw.target \
+        "$systemdsystemunitdir"/rdma-load-modules@.service
+
+    for i in \
+        rdma-load-modules@rdma.service \
+        rdma-load-modules@roce.service \
+        rdma-load-modules@infiniband.service; do
+        $SYSTEMCTL -q --root "$initdir" add-wants initrd.target "$i"
+    done
+}
+
+installkernel() {
+    hostonly='' instmods "=drivers/infiniband" "=drivers/net/ethernet/mellanox" "=drivers/net/ethernet/chelsio" "=drivers/net/ethernet/cisco" "=drivers/net/ethernet/emulex" "=drivers/target"
+    hostonly='' instmods crc-t10dif crct10dif_common xprtrdma svcrdma
+}

redhat/rdma-core.spec

@@ -339,10 +339,10 @@ mkdir -p %{buildroot}/%{_sysconfdir}/rdma
 %global sysmodprobedir %{_prefix}/lib/modprobe.d
 mkdir -p %{buildroot}%{_libexecdir}
 mkdir -p %{buildroot}%{_udevrulesdir}
-mkdir -p %{buildroot}%{dracutlibdir}/modules.d/05rdma
+mkdir -p %{buildroot}%{dracutlibdir}/modules.d/50rdma
 mkdir -p %{buildroot}%{sysmodprobedir}
 install -D -m0644 redhat/rdma.mlx4.conf %{buildroot}/%{_sysconfdir}/rdma/mlx4.conf
-install -D -m0755 redhat/rdma.modules-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh
+install -D -m0755 kernel-boot/dracut/50rdma/module-setup.sh %{buildroot}%{dracutlibdir}/modules.d/50rdma/module-setup.sh
 install -D -m0644 redhat/rdma.mlx4.sys.modprobe %{buildroot}%{sysmodprobedir}/libmlx4.conf
 install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh
 rm -f %{buildroot}%{_sysconfdir}/rdma/modules/rdma.conf
@@ -430,8 +430,8 @@ fi
 %{_unitdir}/rdma-load-modules@.service
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/modules.d
-%dir %{dracutlibdir}/modules.d/05rdma
-%{dracutlibdir}/modules.d/05rdma/module-setup.sh
+%dir %{dracutlibdir}/modules.d/50rdma
+%{dracutlibdir}/modules.d/50rdma/module-setup.sh
 %dir %{_udevrulesdir}
 %{_udevrulesdir}/../rdma_rename
 %{_udevrulesdir}/60-rdma-ndd.rules

redhat/rdma.modules-setup.sh

@@ -483,7 +483,7 @@ mkdir -p %{buildroot}/%{_sysconfdir}/rdma
 %global dracutlibdir %%{_prefix}/lib/dracut/
 
 mkdir -p %{buildroot}%{_udevrulesdir}
-mkdir -p %{buildroot}%{dracutlibdir}/modules.d/05rdma
+mkdir -p %{buildroot}%{dracutlibdir}/modules.d/50rdma
 mkdir -p %{buildroot}%{_modprobedir}
 mkdir -p %{buildroot}%{_unitdir}
 
@@ -496,11 +496,11 @@ chmod 0644 %{buildroot}%{_modprobedir}/mlx4.conf
 install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh
 
 # Dracut file for IB support during boot
-install -D -m0644 suse/module-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh
+install -D -m0644 kernel-boot/dracut/50rdma/module-setup.sh %{buildroot}%{dracutlibdir}/modules.d/50rdma/module-setup.sh
 
 %if "%{_libexecdir}" != "/usr/libexec"
 sed 's-/usr/libexec-%{_libexecdir}-g' -i %{buildroot}%{_modprobedir}/50-libmlx4.conf
-sed 's-/usr/libexec-%{_libexecdir}-g' -i %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh
+sed 's-/usr/libexec-%{_libexecdir}-g' -i %{buildroot}%{dracutlibdir}/modules.d/50rdma/module-setup.sh
 %endif
 
 # ibacm
@@ -652,8 +652,8 @@ done
 %{_unitdir}/rdma-load-modules@.service
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/modules.d
-%dir %{dracutlibdir}/modules.d/05rdma
-%{dracutlibdir}/modules.d/05rdma/module-setup.sh
+%dir %{dracutlibdir}/modules.d/50rdma
+%{dracutlibdir}/modules.d/50rdma/module-setup.sh
 %{_udevrulesdir}/../rdma_rename
 %{_udevrulesdir}/60-rdma-persistent-naming.rules
 %{_udevrulesdir}/75-rdma-description.rules