From c9622afa32b05019286985fcc5b502be8711c57f Mon Sep 17 00:00:00 2001 From: Erik Botö Date: Tue, 9 Jun 2015 15:33:47 +0200 Subject: lxc: allow multiple init systems in DISTRO_FEATURES MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add handling for distros with both systemd and sysvinit by passing multiple init systems to configure with --with-init-script= Signed-off-by: Erik Botö Signed-off-by: Bruce Ashfield --- 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 f79ba762..faa31b7d 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)} \ -- cgit v1.2.3-54-g00ecf