[oe] [meta-networking][PATCH] vsftpd: install volatiles file based on init system

[Paul Eggleton]

On Friday 13 December 2013 09:34:36 Joe MacDonald wrote:
> [Re: [oe] [meta-networking][PATCH] vsftpd: install volatiles file based on init system] On 13.12.13 (Fri 10:33) Paul Eggleton wrote:
> > 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).
> 
> That's a good point and I probably should've at least made mention of it
> in my email.  I'd thought about it (thought I try to only have either
> sysvinit or systemd enabled in a configuration at a time, multiple init
> systems running concurrently make my teeth itch) but I had thought that
> in this case vsftpd would only be relying on one of them (preferring
> systemd if available) to create the volatiles.  Since I try very hard
> not to be in the scenario where I include both, though, I could be
> overlooking a case here.  Do you think I should be doing something more
> like this:
> 
> 62    if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
> 63        install -d ${D}/${sysconfdir}/tmpfiles.d
> 64        install -m 644 ${WORKDIR}/volatiles.99_vsftpd ${D}/${sysconfdir}/tmpfiles.d/99_vsftpd
> 65    fi
> 66    if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
> 67        install -d ${D}/${sysconfdir}/default/volatiles
> 68        install -m 644 ${WORKDIR}/volatiles.99_vsftpd ${D}/${sysconfdir}/default/volatiles/99_vsftpd
> 69    fi

Assuming it's OK to have both of these when both options are on (I haven't
tried it myself), that would seem to be the right thing to do.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre