From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?Beno=c3=aet_Th=c3=a9baudeau?= Date: Wed, 4 Nov 2015 11:07:07 +0100 Subject: [Buildroot] [PATCH v3 02/13] package/dhcp: systemd: rename environment file In-Reply-To: References: <1445734779-7212-1-git-send-email-benoit.thebaudeau.dev@gmail.com> <1445734779-7212-2-git-send-email-benoit.thebaudeau.dev@gmail.com> <5639D774.1030501@wsystem.com> Message-ID: <5639D8CB.2020104@wsystem.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 04/11/2015 11:04, Maxime Hadjinlian wrote: > > > On Wed, Nov 4, 2015 at 11:01 AM, Beno?t Th?baudeau > wrote: > > Hi Maxime, all, > > On 04/11/2015 10:54, Maxime Hadjinlian wrote: > > > > > > On Wed, Nov 4, 2015 at 10:52 AM, Maxime Hadjinlian >> wrote: > > > > Hi Benoit, all > > > > On Sun, Oct 25, 2015 at 2:59 AM, Beno?t Th?baudeau >> 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 >> > > > > --- > > 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