From 2418a3fde6fab7fdd6866b72a0447909d1f653a1 Mon Sep 17 00:00:00 2001 From: Wenchao Hao Date: Thu, 29 Apr 2021 16:22:53 +0800 Subject: [PATCH] Fix systemd error message when enable isnsd.service Signed-off-by: Wenchao Hao --- ...nstall-isnsd.socket-in-isnsd.service.patch | 25 +++++++++++++++++++ open-isns.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0001-Do-not-install-isnsd.socket-in-isnsd.service.patch diff --git a/0001-Do-not-install-isnsd.socket-in-isnsd.service.patch b/0001-Do-not-install-isnsd.socket-in-isnsd.service.patch new file mode 100644 index 0000000..30d32e9 --- /dev/null +++ b/0001-Do-not-install-isnsd.socket-in-isnsd.service.patch @@ -0,0 +1,25 @@ +From 040ee0d91adb8b2f6dd3705e3c193a77b40e69c5 Mon Sep 17 00:00:00 2001 +From: Wenchao Hao +Date: Thu, 29 Apr 2021 16:07:59 +0800 +Subject: [PATCH] Do not install isnsd.socket in isnsd.service + +isnsd.socket is removed from rpm package, so here remove it from isnsd.service +to fix systemd error message + +Signed-off-by: Wenchao Hao +--- + isnsd.service | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/isnsd.service b/isnsd.service +index 76eac6c..3f5fb21 100644 +--- a/isnsd.service ++++ b/isnsd.service +@@ -12,4 +12,3 @@ LimitCORE=infinity + + [Install] + WantedBy=sysinit.target +-Also=isnsd.socket +-- +1.8.3.1 + diff --git a/open-isns.spec b/open-isns.spec index 74d4999..75d8070 100644 --- a/open-isns.spec +++ b/open-isns.spec @@ -1,11 +1,12 @@ Name: open-isns Version: 0.100 -Release: 1 +Release: 2 Summary: The iSNS server and client programs License: LGPLv2+ URL: https://www.github.com/open-iscsi/open-isns Source0: https://www.github.com/open-iscsi/open-isns/archive/v%{version}.tar.gz#/open-isns-%{version}.tar.gz Patch0001: Fix-the-issue-of-ignoring-the-return-value.patch +Patch0002: 0001-Do-not-install-isnsd.socket-in-isnsd.service.patch BuildRequires: gcc git systemd automake autoconf make BuildRequires: openssl-devel systemd-devel Requires(post): systemd-units @@ -89,6 +90,9 @@ install -p -m 644 isnsd.service %{buildroot}%{_unitdir}/isnsd.service %{_mandir}/man8/* %changelog +* Thu Apr 4 2021 Wenchao Hao - 0.100-2 +- Do not install isnsd.socket in isnsd.service + * Mon Jun 1 2020 yanan li - 0.100-1 - Package update -- Gitee