pool/pcp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1000302 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1000302
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcp?expand=0&rev=67
This commit is contained in:
Dominique Leuenberger 2022-08-31 16:08:44 +00:00 committed by Git OBS Bridge
commit 9fa14e1606
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
0011-Revert-systemd-remove-Wants-pmcd-from-pmlogger-and-p.patch Normal file
View File

@ -0,0 +1,43 @@
From de7cd4d7f6d8525d781f3a9dba3b0b5b654e6272 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Mon, 22 Feb 2021 11:32:05 +1100
Subject: [PATCH] Revert "systemd: remove Wants=pmcd from pmlogger and pmie"
This reverts commit e01ab96c813fa31e685ac864031d145f63162088
(for now).
Resolves Red Hat BZs 1929556 and 1930284.
(cherry picked from commit 30ee6b4d6b00b745cb8e44ee6c9ea0a9377398c6)
---
src/pmie/pmie.service.in | 1 +
src/pmlogger/pmlogger.service.in | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/pmie/pmie.service.in b/src/pmie/pmie.service.in
index 75696de40..d234c8a5e 100644
--- a/src/pmie/pmie.service.in
+++ b/src/pmie/pmie.service.in
@@ -4,6 +4,7 @@ Documentation=man:pmie(1)
After=network-online.target pmcd.service
Before=pmie_check.timer pmie_daily.timer
BindsTo=pmie_check.timer pmie_daily.timer
+Wants=pmcd.service
[Service]
Type=notify
diff --git a/src/pmlogger/pmlogger.service.in b/src/pmlogger/pmlogger.service.in
index f5f374e53..b6273d1a0 100644
--- a/src/pmlogger/pmlogger.service.in
+++ b/src/pmlogger/pmlogger.service.in
@@ -4,6 +4,7 @@ Documentation=man:pmlogger(1)
After=network-online.target pmcd.service
Before=pmlogger_check.timer pmlogger_daily.timer pmlogger_daily-poll.timer
BindsTo=pmlogger_check.timer pmlogger_daily.timer pmlogger_daily-poll.timer
+Wants=pmcd.service
[Service]
Type=notify
--
2.35.3

6
pcp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 30 12:50:27 UTC 2022 - David Disseldorp <ddiss@suse.com>
- Add back Wants=pmcd from pmlogger and pmie services; (bsc#1202896)
+ 0011-Revert-systemd-remove-Wants-pmcd-from-pmlogger-and-p.patch
-------------------------------------------------------------------
Wed Jun 8 21:33:14 UTC 2022 - David Disseldorp <ddiss@suse.com>

3
pcp.spec
View File

@ -90,6 +90,8 @@ Patch6: 0006-pmsnap-control-var-www-srv-www.patch
Patch9: 0009-remove-rundir-install.patch
# PATCH-FIX-UPSTREAM, ddiss@suse.de
Patch10: 0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch
# PATCH-FIX-UPSTREAM, ddiss@suse.de
Patch11: 0011-Revert-systemd-remove-Wants-pmcd-from-pmlogger-and-p.patch
%if 0%{?fedora} || 0%{?rhel}
%global disable_selinux 0
@ -2510,6 +2512,7 @@ updated policy package.
%patch6 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
autoconf