commit: 40ab2c0bdac57c335afe04c951e99a9054f71f54 Author: Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com> AuthorDate: Sun Apr 11 14:27:10 2021 +0000 Commit: Theo Anderson <telans <AT> posteo <DOT> de> CommitDate: Sun Apr 11 14:27:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=40ab2c0b
sys-cluster/pcs-0.10.8-r2 fix systemd service Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com> sys-cluster/pcs/files/pcsd-daemon.service.patch | 10 ++++++---- sys-cluster/pcs/pcs-0.10.8-r2.ebuild | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sys-cluster/pcs/files/pcsd-daemon.service.patch b/sys-cluster/pcs/files/pcsd-daemon.service.patch index 00b61cf9a..fa86ef764 100644 --- a/sys-cluster/pcs/files/pcsd-daemon.service.patch +++ b/sys-cluster/pcs/files/pcsd-daemon.service.patch @@ -1,10 +1,12 @@ ---- pcs-0.10.8/pcsd/pcsd-ruby.service 2021-02-01 10:22:26.000000000 +0100 -+++ pcs-0.10.8/pcsd/pcsd-ruby.service.new 2021-03-23 20:13:24.380792446 +0100 -@@ -6,12 +6,11 @@ +--- pcs-0.10.8/pcsd/pcsd-ruby.service 2021-02-01 09:22:26.000000000 -0000 ++++ pcs-0.10.8/pcsd/pcsd-ruby.service.new 2021-04-11 14:13:00.176650050 -0000 +@@ -5,13 +5,12 @@ + Requires=network-online.target After=network-online.target # Stop the service automatically if nothing that depends on it is running - StopWhenUnneeded=true +-StopWhenUnneeded=true -# When stopping or restarting pcsd, stop or restart pcsd-ruby as well ++StopWhenUnneeded=false +# When stopping or restarting pcsd, stop or restart pcsd-daemon as well PartOf=pcsd.service diff --git a/sys-cluster/pcs/pcs-0.10.8-r2.ebuild b/sys-cluster/pcs/pcs-0.10.8-r2.ebuild index 830a07632..1444be359 100644 --- a/sys-cluster/pcs/pcs-0.10.8-r2.ebuild +++ b/sys-cluster/pcs/pcs-0.10.8-r2.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) DISTUTILS_USE_SETUPTOOLS=rdepend -USE_RUBY="ruby25 ruby26" +USE_RUBY="ruby25 ruby26 ruby27" inherit python-single-r1 ruby-ng systemd DESCRIPTION="Pacemaker/Corosync Configuration System" @@ -100,6 +100,8 @@ src_install() { if use systemd ; then systemd_newunit "${S}/pcsd/pcsd.service.debian" "pcsd.service" systemd_newunit "${S}/pcsd/pcsd-ruby.service" "pcsd-daemon.service" + rm "${D}"/usr/lib/systemd/system/pcsd-ruby.service + rm "${D}"/usr/lib/systemd/system/pcsd.service fi # custom service file for openRC newinitd "${FILESDIR}/pcsd.initd" pcsd