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 0000000000000000000000000000000000000000..1dafa83556bd229c4f4e9cd4eec09815d8915424 --- /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 9cafd437c55cbb0977fe4eb32402899dc1022c1c..3a7d32b7d26d80f2b527f31736f65828a37b06ca 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: 3 +Release: 4 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 python3-devel @@ -100,6 +101,9 @@ export CFLAGS="$(echo '%{optflags}')" %{_mandir}/man8/{ocf-tester.8*,ldirectord.8*} %changelog +* Wed Aug 25 2021 caodongxia - 4.2.0-4 +- Fix failed to parse pid from pid-file + * Tue Oct 27 2020 Anan Fu - 4.2.0-3 - disable python2