[meta-virtualization] [PATCH] lxc: allow multiple init systems in DISTRO_FEATURES

[Bruce Ashfield]

On Tue, Jun 9, 2015 at 9:33 AM, Erik Botö <erik.boto at pelagicore.com> wrote:
> Add handling for distros with both systemd and sysvinit by passing
> multiple init systems to configure with --with-init-script=


I've never had much luck with multiple init systems .. but no issues in
merging this change. It is now on the master branch.

Cheers,

Bruce

>
> Signed-off-by: Erik Botö <erik.boto at pelagicore.com>
> ---
>  recipes-containers/lxc/lxc_1.0.7.bb | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-containers/lxc/lxc_1.0.7.bb b/recipes-containers/lxc/lxc_1.0.7.bb
> index f79ba76..faa31b7 100644
> --- a/recipes-containers/lxc/lxc_1.0.7.bb
> +++ b/recipes-containers/lxc/lxc_1.0.7.bb
> @@ -46,7 +46,9 @@ S = "${WORKDIR}/${BPN}-${PV}"
>  PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-tests', '', d)}"
>  EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}"
>
> -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--with-init-script=sysvinit', '--with-init-script=systemd', d)}"
> +EXTRA_OECONF += "--with-init-script=\
> +${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit,', '', d)}\
> +${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
>
>  PACKAGECONFIG ??= "templates \
>      ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
> --
> 1.9.1
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"