From 30f6ee801d0ddd264472ee959547127a09fef625 Mon Sep 17 00:00:00 2001 From: kircher Date: Sat, 13 Mar 2021 18:01:55 +0800 Subject: [PATCH] remove boot error --- bugfix-remove-error-msg-when-boot-rdma.patch | 74 ++++++++++++++++++++ rdma-core.spec | 10 ++- 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 bugfix-remove-error-msg-when-boot-rdma.patch diff --git a/bugfix-remove-error-msg-when-boot-rdma.patch b/bugfix-remove-error-msg-when-boot-rdma.patch new file mode 100644 index 0000000..38126ba --- /dev/null +++ b/bugfix-remove-error-msg-when-boot-rdma.patch @@ -0,0 +1,74 @@ +From fd16670c5f4c46906e01dc343839613c51cc8847 Mon Sep 17 00:00:00 2001 +From: kircher +Date: Thu, 18 Mar 2021 10:48:18 +0800 +Subject: [PATCH] remove boot errot + +--- + redhat/rdma.kernel-init | 45 +++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 37 insertions(+), 8 deletions(-) + +diff --git a/redhat/rdma.kernel-init b/redhat/rdma.kernel-init +index c7444a1..8e726a4 100644 +--- a/redhat/rdma.kernel-init ++++ b/redhat/rdma.kernel-init +@@ -210,20 +210,49 @@ errata_56() + } + + +-load_hardware_modules ++MSG=$(load_hardware_modules 2>&1) + RC=$[ $RC + $? ] +-load_modules $LOAD_CORE_MODULES ++if [ -n "$MSG" ];then ++ echo "WARNING: $MSG" ++fi ++ ++MSG=$(load_modules $LOAD_CORE_MODULES) + RC=$[ $RC + $? ] +-load_modules $LOAD_CORE_CM_MODULES ++if [ -n "$MSG" ];then ++ echo "WARNING: $MSG" ++fi ++ ++MSG=$(load_modules $LOAD_CORE_CM_MODULES) + RC=$[ $RC + $? ] +-load_modules $LOAD_CORE_USER_MODULES ++if [ -n "$MSG" ];then ++ echo "WARNING: $MSG" ++fi ++ ++MSG=$(load_modules $LOAD_CORE_USER_MODULES) + RC=$[ $RC + $? ] +-load_modules $LOAD_ULP_MODULES ++if [ -n "$MSG" ];then ++ echo "WARNING: $MSG" ++fi ++ ++MSG=$(load_modules $LOAD_ULP_MODULES) + RC=$[ $RC + $? ] ++if [ -n "$MSG" ];then ++ echo "WARNING: $MSG" ++fi ++ ++MSG=$(errata_58) ++if [ -n "$MSG" ];then ++ echo "WARNING: $MSG" ++fi + +-errata_58 +-errata_56 ++MSG=$(errata_56) ++if [ -n "$MSG" ];then ++ echo "WARNING: $MSG" ++fi + +-/usr/libexec/rdma-set-sriov-vf ++MSG=$(/usr/libexec/rdma-set-sriov-vf) ++if [ -n "$MSG" ];then ++ echo "WARNING: $MSG" ++fi + + exit $RC +-- +1.8.3.1 + diff --git a/rdma-core.spec b/rdma-core.spec index 82cf994..35b6433 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,6 +1,6 @@ Name: rdma-core Version: 28.1 -Release: 2 +Release: 3 Summary: RDMA core userspace libraries and daemons License: GPLv2 or BSD Url: https://github.com/linux-rdma/rdma-core @@ -48,6 +48,8 @@ Obsoletes: openib-srptools <= 0.0.6 Conflicts: infiniband-diags <= 1.6.7 +Patch9001: bugfix-remove-error-msg-when-boot-rdma.patch + %{?systemd_requires} %define CMAKE_FLAGS -GNinja @@ -254,6 +256,12 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh %{_mandir}/* %changelog +* Sat Mar 13 2020 majun - 28.1-3 +- Type: bugfix +- ID: NA +- SUG: NA +- DESC: remove boot error + * Mon Apr 20 2020 majun - 28.1-2 - Type: bugfix - ID: NA -- Gitee