From: "Benoît Thébaudeau" <benoit@wsystem.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 02/13] package/dhcp: systemd: rename environment file
Date: Wed, 4 Nov 2015 11:07:07 +0100 [thread overview]
Message-ID: <5639D8CB.2020104@wsystem.com> (raw)
In-Reply-To: <CAGduivzaWxVq=OYOH3WjGn_iKRn2qKcJ3h79yi6mekAcn7dMjg@mail.gmail.com>
On 04/11/2015 11:04, Maxime Hadjinlian wrote:
>
>
> On Wed, Nov 4, 2015 at 11:01 AM, Beno?t Th?baudeau <benoit at wsystem.com <mailto:benoit@wsystem.com>> wrote:
>
> Hi Maxime, all,
>
> On 04/11/2015 10:54, Maxime Hadjinlian wrote:
> >
> >
> > On Wed, Nov 4, 2015 at 10:52 AM, Maxime Hadjinlian <maxime.hadjinlian at gmail.com <mailto:maxime.hadjinlian@gmail.com> <mailto:maxime.hadjinlian at gmail.com <mailto:maxime.hadjinlian@gmail.com>>> wrote:
> >
> > Hi Benoit, all
> >
> > On Sun, Oct 25, 2015 at 2:59 AM, Beno?t Th?baudeau <benoit.thebaudeau.dev at gmail.com <mailto:benoit.thebaudeau.dev@gmail.com> <mailto:benoit.thebaudeau.dev at gmail.com <mailto:benoit.thebaudeau.dev@gmail.com>>> wrote:
> >
> > Use the same EnvironmentFile name as the SysV init script for
> > consistency. The filenames under /etc/default/ are usually just the
> > package/daemon/service/feature name without any extension, so remove the
> > ".conf" extension from EnvironmentFile.
> >
> > Signed-off-by: Beno?t Th?baudeau <benoit.thebaudeau.dev at gmail.com <mailto:benoit.thebaudeau.dev@gmail.com> <mailto:benoit.thebaudeau.dev at gmail.com <mailto:benoit.thebaudeau.dev@gmail.com>>>
> >
> > ---
> > Changes v2 -> v3: new patch.
> > ---
> > package/dhcp/dhcpd.service | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/package/dhcp/dhcpd.service b/package/dhcp/dhcpd.service
> > index 7b265cb..5989506 100644
> > --- a/package/dhcp/dhcpd.service
> > +++ b/package/dhcp/dhcpd.service
> > @@ -7,7 +7,7 @@ Type=forking
> > PIDFile=/run/dhcpd.pid
> > ExecStart=/usr/sbin/dhcpd -q -pf /run/dhcpd.pid $INTERFACES
> > KillSignal=SIGINT
> > -EnvironmentFile=/etc/default/dhcpd.conf
> > +EnvironmentFile=/etc/default/dhcpd
> >
> > Maybe this should be:
> > EnvironmentFile-=/etc/default/dhcpd
> >
> > Notice the '-' before the '=', in case the file doesn't exists, it won't print a warning or error the whole service.
> >
> > My mistake, the '-' should be *AFTER* the '='.
>
> See 06/13.
>
> Ah yes, should they be squashed ?
No: these patches have different purposes.
> > When I build dhcp, I did not find a /etc/default folder in my target directory, am I missing something there ?
>
> You might have this question about 13/13 which requires a file in /etc/default,
> but not here because of 06/13. But a default file provided by Buildroot would
> not make sense for 13/13 since the file contents would be application-specific
> though required. In this case, it is up to users to add a rootfs overlay with
> such files.
>
> Ok, that's fair enough.
>
>
> > [Install]
> > WantedBy=multi-user.target
> > --
> > 2.1.4
Best regards,
Beno?t
next prev parent reply other threads:[~2015-11-04 10:07 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-25 0:59 [Buildroot] [PATCH v3 01/13] package/dhcp: fix SysV init scripts option passing Benoît Thébaudeau
2015-10-25 0:59 ` [Buildroot] [PATCH v3 02/13] package/dhcp: systemd: rename environment file Benoît Thébaudeau
2015-11-04 9:52 ` Maxime Hadjinlian
2015-11-04 9:54 ` Maxime Hadjinlian
2015-11-04 10:01 ` Benoît Thébaudeau
2015-11-04 10:04 ` Maxime Hadjinlian
2015-11-04 10:07 ` Benoît Thébaudeau [this message]
2015-11-04 10:13 ` Maxime Hadjinlian
2015-11-04 10:18 ` Thomas Petazzoni
2015-11-04 10:24 ` Benoît Thébaudeau
2015-11-04 10:25 ` Maxime Hadjinlian
2015-11-04 18:42 ` Gabe Evans
2015-12-24 14:00 ` Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 03/13] package/dhcp/S80dhcp-server: support extra options Benoît Thébaudeau
2015-12-24 14:00 ` Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 04/13] package/dhcp: systemd: " Benoît Thébaudeau
2015-11-04 10:09 ` Maxime Hadjinlian
2015-12-24 14:01 ` Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 05/13] package/dhcp/S80dhcp-server: allow empty INTERFACES Benoît Thébaudeau
2015-12-24 14:02 ` Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 06/13] package/dhcp: systemd: allow missing environment file Benoît Thébaudeau
2015-11-04 10:14 ` Maxime Hadjinlian
2015-12-24 14:03 ` Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 07/13] package/dhcp: fix SysV init scripts output text Benoît Thébaudeau
2015-12-24 14:05 ` Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 08/13] package/dhcp: remove sleep from SysV init scripts restart Benoît Thébaudeau
2015-12-24 14:06 ` Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 09/13] package/dhcp: SysV init scripts: remove PID files after stop Benoît Thébaudeau
2015-12-24 14:26 ` Thomas Petazzoni
2016-01-07 20:40 ` Benoît Thébaudeau
2015-10-25 0:59 ` [Buildroot] [PATCH v3 10/13] package/dhcp/S80dhcp-server: support IPv6 lease file Benoît Thébaudeau
2015-10-25 0:59 ` [Buildroot] [PATCH v3 11/13] package/dhcp: systemd: " Benoît Thébaudeau
2015-11-04 10:21 ` Maxime Hadjinlian
2015-11-04 10:36 ` Benoît Thébaudeau
2015-11-04 10:53 ` Maxime Hadjinlian
2015-11-04 11:15 ` Benoît Thébaudeau
2015-11-04 11:31 ` Maxime Hadjinlian
2015-11-09 10:49 ` Benoît Thébaudeau
2015-11-12 10:42 ` Maxime Hadjinlian
2015-11-15 17:55 ` Benoît Thébaudeau
2015-10-25 0:59 ` [Buildroot] [PATCH v3 12/13] package/dhcp: SysV init scripts: refactor using functions Benoît Thébaudeau
2015-10-25 0:59 ` [Buildroot] [PATCH v3 13/13] package/dhcp: systemd: add dhcrelay service file Benoît Thébaudeau
2015-11-04 11:24 ` Maxime Hadjinlian
2015-11-04 13:35 ` Benoît Thébaudeau
2015-11-04 21:26 ` Arnout Vandecappelle
2015-11-15 17:36 ` Benoît Thébaudeau
2015-12-24 13:59 ` [Buildroot] [PATCH v3 01/13] package/dhcp: fix SysV init scripts option passing Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5639D8CB.2020104@wsystem.com \
--to=benoit@wsystem.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox