Bug 684366 – sys-cluster/ceph add possibility to add extra_commands from confd

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Georgy Yakovlev 2019-04-25 18:58:54 UTC]

Created attachment 574160 [details, diff]
0001-sys-cluster-ceph-revbump-for-new-initscript-rev.patch

I'm in a situation when I need to define

healthcheck()
and
unhealthy()

function in confd file,

but since confd file is sourced before initd, initd just overrides extra_commands variable, removing mentioned functions.

and openrc will fail to run healthcheck like this

unknown function `healthcheck'
unknown function `unhealthy'


the diff is simple

--- ceph.initd-r11      2019-01-08 11:48:55.092282157 -0800
+++ ceph.initd-r12      2019-04-25 11:49:19.927000285 -0700
@@ -21,7 +21,7 @@
 
 command="/usr/bin/${RC_SVCNAME%%.*}"
 command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-extra_commands="reload"
+extra_commands="${extra_commands} reload"
 command_args_foreground="--foreground"
 
 retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"

[Comment 1 Larry the Git Cow 2019-04-29 22:57:55 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0a3b797ef4f4d5e018f119227fd76c3cc87334

commit 6d0a3b797ef4f4d5e018f119227fd76c3cc87334
Author:     Patrick McLean <[e-mail]>
AuthorDate: 2019-04-29 22:56:33 +0000
Commit:     Patrick McLean <[e-mail]>
CommitDate: 2019-04-29 22:56:33 +0000

    sys-cluster/ceph: Bump current ~ versions for bug #684366
    
    Closes: https://bugs.gentoo.org/684366
    Copyright: Sony Interactive Entertainment Inc.
    Package-Manager: Portage-2.3.65, Repoman-2.3.12
    Signed-off-by: Patrick McLean <[e-mail]>

 sys-cluster/ceph/{ceph-12.2.12-r1.ebuild => ceph-12.2.12-r2.ebuild} | 2 +-
 sys-cluster/ceph/{ceph-13.2.5-r3.ebuild => ceph-13.2.5-r4.ebuild}   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Additionally, it has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8312633ba545894a52d9ec130a05e7c8068e0196

commit 8312633ba545894a52d9ec130a05e7c8068e0196
Author:     Patrick McLean <[e-mail]>
AuthorDate: 2019-04-29 22:54:40 +0000
Commit:     Patrick McLean <[e-mail]>
CommitDate: 2019-04-29 22:54:40 +0000

    sys-cluster/ceph: Version bump to 14.2.1
    
    - Add experimental support for USE="system-boost" with boost-1.70
    - Revbump init script to allow extra commands in conf.d (bug 684366)
    
    Bug: https://bugs.gentoo.org/684366
    Copyright: Sony Interactive Entertainment Inc.
    Package-Manager: Portage-2.3.65, Repoman-2.3.12
    Signed-off-by: Patrick McLean <[e-mail]>

 sys-cluster/ceph/Manifest                          |   1 +
 sys-cluster/ceph/ceph-14.2.1.ebuild                | 362 +++++++++++++++++++++
 .../files/ceph-14.2.0-boost-1.70-sonames.patch     | 321 ++++++++++++++++++
 .../ceph/files/ceph-14.2.0-boost-1.70.patch        | 120 +++++++
 sys-cluster/ceph/files/ceph.initd-r12              | 115 +++++++
 5 files changed, 919 insertions(+)