diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-09-01 13:11:55 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-09-01 13:13:41 -0400 |
commit | affa735a7fddb253057196a929df541fc4bae817 (patch) | |
tree | fed43690590aaae45ddbec1806614dc2bfeb3d7a | |
parent | 2aba098ec320f13fc8df1be075f48d3d0d661a7e (diff) | |
download | meta-virtualization-affa735a7fddb253057196a929df541fc4bae817.tar.gz |
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 <bruce.ashfield@windriver.com>
-rw-r--r-- | recipes-containers/lxc/lxc_1.1.2.bb | 6 |
1 files 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}" | |||
74 | # For LXC the docdir only contains example configuration files and should be included in the lxc package | 74 | # For LXC the docdir only contains example configuration files and should be included in the lxc package |
75 | FILES_${PN} += "${docdir}" | 75 | FILES_${PN} += "${docdir}" |
76 | FILES_${PN}-dbg += "${libexecdir}/lxc/.debug" | 76 | FILES_${PN}-dbg += "${libexecdir}/lxc/.debug" |
77 | PACKAGES =+ "${PN}-templates ${PN}-setup" | 77 | PACKAGES =+ "${PN}-templates ${PN}-setup ${PN}-networking" |
78 | FILES_${PN}-templates += "${datadir}/lxc/templates" | 78 | FILES_${PN}-templates += "${datadir}/lxc/templates" |
79 | RDEPENDS_${PN}-templates += "bash" | 79 | RDEPENDS_${PN}-templates += "bash" |
80 | 80 | ||
81 | ALLOW_EMPTY_${PN}-networking = "1" | ||
82 | |||
81 | FILES_${PN}-setup += "/etc/tmpfiles.d" | 83 | FILES_${PN}-setup += "/etc/tmpfiles.d" |
82 | FILES_${PN}-setup += "/lib/systemd/system" | 84 | FILES_${PN}-setup += "/lib/systemd/system" |
83 | FILES_${PN}-setup += "/usr/lib/systemd/system" | 85 | FILES_${PN}-setup += "/usr/lib/systemd/system" |
@@ -114,7 +116,7 @@ pkg_postinst_${PN}() { | |||
114 | fi | 116 | fi |
115 | } | 117 | } |
116 | 118 | ||
117 | pkg_postinst_${PN}-setup() { | 119 | pkg_postinst_${PN}-networking() { |
118 | if [ "x$D" != "x" ]; then | 120 | if [ "x$D" != "x" ]; then |
119 | exit 1 | 121 | exit 1 |
120 | fi | 122 | fi |