From: Mingli Yu Date: Tue, 15 Apr 2025 03:50:16 +0000 (+0800) Subject: systemd: Correct tmpfile.d file for resolv.conf X-Git-Tag: uninative-4.8~750 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3020c11c91304b7400bc19f80e44e7d3720281d;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git systemd: Correct tmpfile.d file for resolv.conf The tmpfiles config for systemd-resolve has been split out [1], so correct tmpfile.d file for resolv.conf in our recipe accordingly. [ YOCTO # 15768] [1] https://github.com/systemd/systemd/commit/b15f6eae421ad64773c0be934fd372d1ca230adb Signed-off-by: Mingli Yu Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/systemd/systemd_257.5.bb b/meta/recipes-core/systemd/systemd_257.5.bb index 24aad11c0ab..bd57f1f5a57 100644 --- a/meta/recipes-core/systemd/systemd_257.5.bb +++ b/meta/recipes-core/systemd/systemd_257.5.bb @@ -360,7 +360,7 @@ do_install() { ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd else resolv_conf="${@bb.utils.contains('RESOLV_CONF', 'stub-resolv', 'run/systemd/resolve/stub-resolv.conf', 'run/systemd/resolve/resolv.conf', d)}" - sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../${resolv_conf}%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf + sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../${resolv_conf}%g" ${D}${exec_prefix}/lib/tmpfiles.d/systemd-resolve.conf ln -s ../${resolv_conf} ${D}${sysconfdir}/resolv-conf.systemd fi if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then