!17 [sync] PR-15: 修复开启selinux后导致服务启动失败

From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-03-30 01:15:57 +00:00 committed by Gitee
commit 51708a6c25
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 17 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff --git a/etc/rrdcached.service.in b/etc/rrdcached.service.in
index 3b6f309..2942a13 100644
--- a/etc/rrdcached.service.in
+++ b/etc/rrdcached.service.in
@@ -6,6 +6,7 @@
[Unit]
Description=Data caching daemon for rrdtool
Documentation=man:rrdcached(1)
+Requires=rrdcached.socket
[Service]
# If you enable socket-activable rrdcached.socket,

View File

@ -1,6 +1,6 @@
Name: rrdtool
Version: 1.7.0
Release: 20
Release: 21
Summary: RA tool for data logging and analysis
License: GPLv2+ with exceptions
URL: http://oss.oetiker.ch/rrdtool/
@ -9,6 +9,7 @@ Source1: php4-r1190.tar.gz
Patch0001: rrdtool-1.6.0-ruby-2-fix.patch
Patch0002: rrdtool-1.4.8-php-ppc-fix.patch
Patch0003: rrdtool-1.7.0-fix-configure-parameters.patch
Patch0004: Fix-rrdcached.service-start-failed-with-selinux_on.patch
Requires(post): systemd
Requires(preun): systemd
@ -215,6 +216,9 @@ chrpath -d %{buildroot}/%{python3_sitearch}/*.so
%{_mandir}/man3/*
%changelog
* Tue Dec 06 2022 xu_ping <xuping33@h-partners.com> - 1.7.0-21
- fix rrdcached.service start failed when selinux enforcing.
* Mon Nov 14 2022 yaoxin <yaoxin30@h-partners.com> - 1.7.0-20
- Modify invalid Source