Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: Gentoo Dev <gentoo-dev@l.g.o>
Subject: Re: [gentoo-dev] [PATCH] systemd.eclass: Improve systemd_install_serviced documentation
Date: Wed, 14 Jun 2017 02:53:05
Message-Id: CAJ0EP433gJ8vWA2baJy7Si++WJ=ckWzP9SjNnxyPtkVFTVTcoA@mail.gmail.com
In Reply to: Re: [gentoo-dev] [PATCH] systemd.eclass: Improve systemd_install_serviced documentation by "Michał Górny"
1 On Tue, Jun 13, 2017 at 6:58 PM, Michał Górny <mgorny@g.o> wrote:
2 > On nie, 2017-06-11 at 20:23 +0100, Chris Mayo wrote:
3 >> Signed-off-by: Chris Mayo <aklhfex@×××××.com>
4 >> ---
5 >>
6 >> Nothing added, just suggesting how it could be made easier to understand.
7 >>
8 >> Chris
9 >>
10 >> eclass/systemd.eclass | 10 +++++-----
11 >> 1 file changed, 5 insertions(+), 5 deletions(-)
12 >>
13 >> diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
14 >> index 7e46e80119c..49f7480228b 100644
15 >> --- a/eclass/systemd.eclass
16 >> +++ b/eclass/systemd.eclass
17 >> @@ -178,12 +178,12 @@ systemd_newuserunit() {
18 >> }
19 >>
20 >> # @FUNCTION: systemd_install_serviced
21 >> -# @USAGE: <conf-file> [<service.d>]
22 >> +# @USAGE: <conf-file> [<service>]
23 >> # @DESCRIPTION:
24 >> -# Install the file <conf-file> as service.d/00gentoo.conf template.
25 >> -# The <service.d> argument specifies the configured service name.
26 >> -# If not specified, the configuration file name will be used with .conf
27 >> -# suffix stripped (e.g. foo.service.conf -> foo.service).
28 >> +# Install <conf-file> as the template <service>.d/00gentoo.conf.
29 >> +# If <service> is not specified
30 >> +# <conf-file> with the .conf suffix stripped is used
31 >> +# (e.g. foo.service.conf -> foo.service.d/00gentoo.conf).
32 >> systemd_install_serviced() {
33 >> debug-print-function ${FUNCNAME} "${@}"
34 >>
35 >
36 > This is meritoriously wrong. The second argument is required to have
37 > '.d' suffix, while your help text suggests that '.d' is appended
38 > implicitly.
39
40 WTF are you talking about?
41
42 # avoid potentially common mistake
43 [[ ${service} == *.d ]] && die "Service must not have .d suffix"

Replies