summaryrefslogtreecommitdiffstats
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:12:42 +0100
commitf3e9be37e80b884ec142dc90e1984142a230c772 (patch)
tree48099d3434da71995df99bf1e0ba10cf65fcd529 /meta/recipes-core/systemd/systemd_216.bb
parent5cc591748e4f8ec3048137ea67fa75bf3b50cb20 (diff)
downloadpoky-f3e9be37e80b884ec142dc90e1984142a230c772.tar.gz
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. (From OE-Core rev: 7e2b05a6f59209687829225878a19a1dad8143b9) Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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=
36 file://00-create-volatile.conf \ 36 file://00-create-volatile.conf \
37 file://init \ 37 file://init \
38 file://run-ptest \ 38 file://run-ptest \
39 ${@bb.utils.contains('PACKAGECONFIG', 'resolved', '', 'file://0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch', d)} \
39 " 40 "
40 41
41S = "${WORKDIR}/git" 42S = "${WORKDIR}/git"