Fix failed to parse pid from pid-file

(cherry picked from commit 914833974389b7b0bc89d83dfc306e8f7977b6c8)
This commit is contained in:
caodongxia 2021-08-25 16:22:40 +08:00 committed by openeuler-sync-bot
parent 98707927c1
commit 72a722464f
2 changed files with 29 additions and 1 deletions

View File

@ -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

View File

@ -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 <caodongxia@huawei.com> - 4.2.0-4
- Fix failed to parse pid from pid-file
* Tue Oct 27 2020 Anan Fu <fuanan3@huawei.com> - 4.2.0-3
- disable python2