mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-20 05:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #637 from flatcar-linux/kai/revert-stub-resolver

Browse Source 
Revert "sys-apps/systemd: Drop the resolv.conf workaround"
This commit is contained in:
Kai Lüke 2020-10-13 13:46:52 +09:00 committed by GitHub
commit e5bde0a027
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild vendored
View File

@ -179,6 +179,17 @@ src_unpack() {
src_prepare() { src_prepare() {
# Flatcar: We don't have separate patches, so no patching code here. # Flatcar: We don't have separate patches, so no patching code here.
#
# Flatcar: Use the resolv.conf managed by systemd-resolved.
# This shouldn't be necessary anymore. Added because of a bug
# https://github.com/systemd/systemd/issues/3826, which is
# apparently resolved in
# https://github.com/systemd/systemd/pull/5276 but another reason is
# that when /etc/resolve.conf is bind-mounted to a new network
# namespace it shouldn't contain the loopback IP address of the host
# which is not reachable from another network namespace.
sed -i -e 's,/run/systemd/resolve/stub-resolv.conf,/run/systemd/resolve/resolv.conf,' tmpfiles.d/etc.conf.m4 || die
default default
} }