From: Paul Eggleton <paul.eggleton@linux.intel.com>
To: Joe MacDonald <joe@deserted.net>
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-networking][PATCH] vsftpd: install volatiles file based on init system
Date: Fri, 13 Dec 2013 10:33:55 +0000 [thread overview]
Message-ID: <27197377.bBKUcS7Jmv@helios> (raw)
In-Reply-To: <1386874857-8596-1-git-send-email-joe@deserted.net>
Hi Joe,
On Thursday 12 December 2013 14:00:57 Joe MacDonald wrote:
> The sysvinit populate-volatile.sh scans for volatiles in
> /etc/default/volatiles. systemd expects the same format files to live in
> /etc/tmpfiles.d. Depedning on the DISTRO_FEATURE list, install vsftpd's
> volatiles file to the expected location. While we're here, drop the
> creation of the empty ${localstatedir}/run/ hierarchy since they should be
> created by the volatiles processing.
>
> Signed-off-by: Joe MacDonald <joe@deserted.net>
> ---
> meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb index
> 0698a63..9d82fd7 100644
> --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> @@ -59,8 +59,13 @@ do_install() {
> install -m 600 ${WORKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf
> install -d ${D}${sysconfdir}/init.d/
> install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/vsftpd
> - install -d ${D}/${sysconfdir}/default/volatiles
> - install -m 644 ${WORKDIR}/volatiles.99_vsftpd
> ${D}/${sysconfdir}/default/volatiles/99_vsftpd + if
> ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then +
> install -d ${D}/${sysconfdir}/tmpfiles.d
> + install -m 644 ${WORKDIR}/volatiles.99_vsftpd
> ${D}/${sysconfdir}/tmpfiles.d/99_vsftpd + else
> + install -d ${D}/${sysconfdir}/default/volatiles
> + install -m 644 ${WORKDIR}/volatiles.99_vsftpd
> ${D}/${sysconfdir}/default/volatiles/99_vsftpd + fi
>
> install -m 600 ${WORKDIR}/vsftpd.ftpusers ${D}${sysconfdir}/
> install -m 600 ${WORKDIR}/vsftpd.user_list ${D}${sysconfdir}/
> @@ -70,7 +75,6 @@ do_install() {
> sed -i "s:/lib/security:${base_libdir}/security:"
> ${D}${sysconfdir}/pam.d/vsftpd sed -i "s:ftpusers:vsftpd.ftpusers:"
> ${D}${sysconfdir}/pam.d/vsftpd fi
> - install -d ${D}${localstatedir}/run/vsftpd/empty
> }
>
> INITSCRIPT_PACKAGES = "${PN}"
I think there might be a problem with this: the DISTRO_FEATURES options aren't
mutually exclusive - both can be enabled at the same time (usually where you
want sysvinit for some rescue/initramfs image and systemd for the main image).
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
next prev parent reply other threads:[~2013-12-13 10:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-12 19:00 [meta-networking][PATCH] vsftpd: install volatiles file based on init system Joe MacDonald
2013-12-13 10:33 ` Paul Eggleton [this message]
2013-12-13 14:34 ` Joe MacDonald
2013-12-13 14:45 ` Paul Eggleton
2014-03-11 16:17 ` Javier Viguera
2014-03-11 17:05 ` Joe MacDonald
2014-03-11 17:40 ` Javier Viguera
2014-03-14 12:47 ` Joe MacDonald
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=27197377.bBKUcS7Jmv@helios \
--to=paul.eggleton@linux.intel.com \
--cc=joe@deserted.net \
--cc=openembedded-devel@lists.openembedded.org \
/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