aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd_216.bb
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2014-09-18 10:16:39 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-29 12:11:47 +0100
commit7e2b05a6f59209687829225878a19a1dad8143b9 (patch)
tree481620ab9e7033237438a1092a5678972a27d370 /meta/recipes-core/systemd/systemd_216.bb
parent4b503f25f1ef8f554d3c76d88399db379dc818cc (diff)
downloadopenembedded-core-contrib-7e2b05a6f59209687829225878a19a1dad8143b9.tar.gz
openembedded-core-contrib-7e2b05a6f59209687829225878a19a1dad8143b9.tar.bz2
openembedded-core-contrib-7e2b05a6f59209687829225878a19a1dad8143b9.zip
systemd: disable resolv.conf symlink unless resolved is enabled
The tmpfiles configuration in systemd unconditionally creates a symlink from /etc/resolv.conf to the location where systemd's resolved service will place the real file. This link is only appropriate when resolved is enabled and running: its presence prevents connman or other systems from providing a working resolv.conf when systemd is not assigned that responsibility. OE has not yet enabled systemd's networkd or resolved by default. There is a TODO in the systemd source to fix this, but it has not been addressed upstream. This patch comments out the corresponding line when resolved is not enabled in the package configuration. Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/systemd/systemd_216.bb')
-rw-r--r--meta/recipes-core/systemd/systemd_216.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb
index 331da99479..ebf939574d 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -36,6 +36,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
file://00-create-volatile.conf \
file://init \
file://run-ptest \
+ ${@bb.utils.contains('PACKAGECONFIG', 'resolved', '', 'file://0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch', d)} \
"
S = "${WORKDIR}/git"