From affa735a7fddb253057196a929df541fc4bae817 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 1 Sep 2015 13:11:55 -0400 Subject: lxc: split networking configuration into separate -networking package The networking configuration that is part of the lxc-setup package is not appropriate for all use cases, or init systems. To avoid having this configuration be pulled in by default, we create an empty -networking package that handles the configuration. Images can enable this step by including lxc-networking in the install package list. Signed-off-by: Bruce Ashfield --- recipes-containers/lxc/lxc_1.1.2.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes-containers/lxc/lxc_1.1.2.bb b/recipes-containers/lxc/lxc_1.1.2.bb index 7bbae88b..a20b8e4b 100644 --- a/recipes-containers/lxc/lxc_1.1.2.bb +++ b/recipes-containers/lxc/lxc_1.1.2.bb @@ -74,10 +74,12 @@ FILES_${PN}-doc = "${mandir} ${infodir}" # For LXC the docdir only contains example configuration files and should be included in the lxc package FILES_${PN} += "${docdir}" FILES_${PN}-dbg += "${libexecdir}/lxc/.debug" -PACKAGES =+ "${PN}-templates ${PN}-setup" +PACKAGES =+ "${PN}-templates ${PN}-setup ${PN}-networking" FILES_${PN}-templates += "${datadir}/lxc/templates" RDEPENDS_${PN}-templates += "bash" +ALLOW_EMPTY_${PN}-networking = "1" + FILES_${PN}-setup += "/etc/tmpfiles.d" FILES_${PN}-setup += "/lib/systemd/system" FILES_${PN}-setup += "/usr/lib/systemd/system" @@ -114,7 +116,7 @@ pkg_postinst_${PN}() { fi } -pkg_postinst_${PN}-setup() { +pkg_postinst_${PN}-networking() { if [ "x$D" != "x" ]; then exit 1 fi -- cgit v1.2.3-54-g00ecf