From 1e4b078efac5dbab584a9f39639d6051afbd2921 Mon Sep 17 00:00:00 2001 From: wu-leilei Date: Sat, 27 Nov 2021 11:29:49 +0800 Subject: [PATCH] fix failed to parse pid from pid-file --- fix-failed-to-parse-pid-from-pid-file.patch | 24 +++++++++++++++++++++ resource-agents.spec | 8 +++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 fix-failed-to-parse-pid-from-pid-file.patch diff --git a/fix-failed-to-parse-pid-from-pid-file.patch b/fix-failed-to-parse-pid-from-pid-file.patch new file mode 100644 index 0000000..1dafa83 --- /dev/null +++ b/fix-failed-to-parse-pid-from-pid-file.patch @@ -0,0 +1,24 @@ +From 60366e7a877919b7767736cbbb7850588f461490 Mon Sep 17 00:00:00 2001 +From: caodongxia <315816521@qq.com> +Date: Wed, 25 Aug 2021 16:12:22 +0800 +Subject: [PATCH] fix failed to parse pid from pid-file + +--- + ldirectord/systemd/ldirectord.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ldirectord/systemd/ldirectord.service.in b/ldirectord/systemd/ldirectord.service.in +index 191f62a..aafc2dc 100644 +--- a/ldirectord/systemd/ldirectord.service.in ++++ b/ldirectord/systemd/ldirectord.service.in +@@ -4,6 +4,7 @@ Documentation=man:ldirectord(8) + + [Service] + ExecStart=@sbindir@/ldirectord start ++ExecStartPost=/usr/bin/sleep 0.1 + ExecStartPost=/usr/bin/touch /var/lock/subsys/ldirectord + ExecStop=@sbindir@/ldirectord stop + ExecStopPost=@RM@ -f /var/lock/subsys/ldirectord +-- +2.27.0 + diff --git a/resource-agents.spec b/resource-agents.spec index 3651329..99ed2e7 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -1,10 +1,11 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.2.0 -Release: 2 +Release: 3 License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents Source0: https://github.com/ClusterLabs/resource-agents/archive/v4.2.0.tar.gz +Patch0000: fix-failed-to-parse-pid-from-pid-file.patch Obsoletes: heartbeat-resources <= %{version} Provides: heartbeat-resources = %{version} BuildRequires: automake autoconf pkgconfig gcc perl-interpreter perl-generators python2-devel @@ -105,5 +106,8 @@ export CFLAGS="$(echo '%{optflags}')" %{_mandir}/man8/{ocf-tester.8*,ldirectord.8*} %changelog +* Sat Nov 27 2021 wulei - 4.2.0-3 +- Fix failed to parse pid from pid-file + * Thu Mar 5 2020 shijian - 4.2.0-2 -- Package init \ No newline at end of file +- Package init -- Gitee