From d6a9f8881e26c68f7e71568c8184ec83ce48e3782d688aa711df91fc941f67d9 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Fri, 22 Jan 2021 13:58:35 +0000 Subject: [PATCH] Accepting request 866021 from home:NMoreyChaisemartin:branches:science:HPC - Add srp_daemon-Fix-systemd-dependency.patch to make sure srp_daemon is loaded at boot if enabled (bsc#1180196) OBS-URL: https://build.opensuse.org/request/show/866021 OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=141 --- rdma-core.changes | 6 ++++++ rdma-core.spec | 4 +++- srp_daemon-Fix-systemd-dependency.patch | 27 +++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 srp_daemon-Fix-systemd-dependency.patch diff --git a/rdma-core.changes b/rdma-core.changes index a5a6581..3e7d8ff 100644 --- a/rdma-core.changes +++ b/rdma-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 22 13:17:42 UTC 2021 - Nicolas Morey-Chaisemartin + +- Add srp_daemon-Fix-systemd-dependency.patch to make sure srp_daemon + is loaded at boot if enabled (bsc#1180196) + ------------------------------------------------------------------- Tue Sep 8 09:58:55 UTC 2020 - Nicolas Morey-Chaisemartin diff --git a/rdma-core.spec b/rdma-core.spec index 2594b1b..4fef8c4 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,7 +1,7 @@ # # spec file for package rdma-core # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -70,6 +70,7 @@ Patch1: Revert-libcxgb3-Remove-libcxgb3-from-rdma-core.patch Patch2: Revert-Update-kernel-headers.patch Patch3: disable-rdma-interface-renaming.patch Patch4: cxgb3-nes-fix-declaration-of-free_context.patch +Patch5: srp_daemon-Fix-systemd-dependency.patch BuildRequires: binutils BuildRequires: cmake >= 2.8.11 BuildRequires: gcc @@ -415,6 +416,7 @@ easy, object-oriented access to IB verbs. %patch2 %patch3 %patch4 +%patch5 %build diff --git a/srp_daemon-Fix-systemd-dependency.patch b/srp_daemon-Fix-systemd-dependency.patch new file mode 100644 index 0000000..0cd1f98 --- /dev/null +++ b/srp_daemon-Fix-systemd-dependency.patch @@ -0,0 +1,27 @@ +commit b0847e590432e4143ad5ccd22c9239746ad71b91 +Author: Nicolas Morey-Chaisemartin +Date: Mon Jan 11 10:51:01 2021 +0100 + + srp_daemon: Fix systemd dependency + + remote-fs-pre.target is a passive target that is not loaded without someone + actively requiring it. Even is remote-fs.target is active. + This means that srp_daemon will not get started at boot + unless another service explicitely requires remote-fs-pre.target. + + This solves the issue by having the srp_daemon service wanted by + the multi-user.target. + + Fixes: 1c7fe513e3e9 (srp_daemon: One systemd service per port) + Signed-off-by: Nicolas Morey-Chaisemartin + +diff --git srp_daemon/srp_daemon.service.in srp_daemon/srp_daemon.service.in +index 188b7e1a3712..bdd70db566af 100644 +--- srp_daemon/srp_daemon.service.in ++++ srp_daemon/srp_daemon.service.in +@@ -16,4 +16,4 @@ ProtectKernelModules=yes + RestrictRealtime=yes + + [Install] +-WantedBy=remote-fs-pre.target ++WantedBy=multi-user.target