[PATCH] systemd: don't symlink /etc/resolv.conf if resolved is disabled
From: Carlos Alberto Lopez Perez <hidden>
Date: 2017-08-21 19:06:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
* symlinking /etc/resolv.conf to /run/systemd/resolve/resolv.conf when resolved is not enabled is wrong, as this prevents network manager from handling the resolv.conf file itself and breaking DNS resolution. See: NetworkManager.conf manpage or https://git.io/v5UJQ Signed-off-by: Carlos Alberto Lopez Perez <redacted> --- meta/recipes-core/systemd/systemd_234.bb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index 4560cf4175..dddad62941 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb@@ -235,12 +235,7 @@ do_install() { if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)} fi - if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false', d)}; then - echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf - echo 'd /run/systemd/resolve 0755 root root -' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf - echo 'f /run/systemd/resolve/resolv.conf 0644 root root' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf - ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd - else + if ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false', d)}; then sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd fi
--
2.11.0