!85 添加ExecStartPost选项到pmwebd.service解决pmwebd服务启动报错

From: @wk333 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek

add-ExecStartPost-option-to-pmwebd-service.patch

@@ -0,0 +1,24 @@
+From 9d04579d74866bfa9022f4f17291be4b807bb218 Mon Sep 17 00:00:00 2001
+From: wk333 <13474090681@163.com>
+Date: Thu, 16 Feb 2023 16:02:59 +0800
+Subject: [PATCH 1/1] add ExecStartPost option to pmwebd.service
+
+---
+ src/pmwebd/pmwebd.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pmwebd/pmwebd.service.in b/src/pmwebd/pmwebd.service.in
+index 4f0c44c..5dc462e 100644
+--- a/src/pmwebd/pmwebd.service.in
++++ b/src/pmwebd/pmwebd.service.in
+@@ -8,6 +8,7 @@ After=network-online.target avahi-daemon.service pmcd.service
+ Type=forking
+ Restart=always
+ ExecStart=@PCP_RC_DIR@/pmwebd start
++ExecStartPost=/usr/bin/sleep 0.1
+ ExecStop=@PCP_RC_DIR@/pmwebd stop
+ PIDFile=@PCP_RUN_DIR@/pmwebd.pid
+  
+-- 
+2.27.0
+

pcp.spec

@@ -9,7 +9,7 @@
 Name:             pcp
 Version:          4.1.3
 Summary:          System-level performance monitoring and performance management
-Release:          14
+Release:          15
 License:          GPLv2+ and LGPLv2.1+ and CC-BY-SA-3.0
 URL:              https://pcp.io
 Source0:          https://dl.bintray.com/pcp/source/pcp-4.1.3.tar.gz
@@ -23,6 +23,7 @@ Patch0003:        Add-pcp_domain-selinux-policy.patch
 Patch6000:        CVE-2019-3695-CVE-2019-3696.patch
 #Refer:           https://github.com/performancecopilot/pcp/pull/822
 Patch0004:        fix-out-of-range-mpstat.patch
+Patch0005:        add-ExecStartPost-option-to-pmwebd-service.patch
 
 BuildRequires:    gcc gcc-c++ procps autoconf bison flex nss-devel rpm-devel avahi-devel xz-devel zlib-devel
 BuildRequires:    python2-devel python3-devel ncurses-devel readline-devel cyrus-sasl-devel papi-devel libpfm-devel >= 4
@@ -870,6 +871,7 @@ This package installs selinux support files for PCP.
 %patch0003 -p1
 %patch6000 -p1
 %patch0004 -p1
+%patch0005 -p1
 
 %build
 
@@ -2223,6 +2225,9 @@ fi
 %config(noreplace) /etc/pcp/pmrep/*
 
 %changelog
+* Thu Feb 16 2023 wangkai <wangkai385@h-partners.com> - 4.1.3-15
+- Add ExecStartPost option to pmwebd.service for solving error message when pmwebd starting
+
 * Thu Jul 14 2022 caodongxia <caodongxia@h-partners.com> - 4.1.3-14
 - Fix out of range in pcp-mpstat