mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-18 10:27:00 +02:00
Merge pull request #730 from f0o/issue-285-full
Update systemd-9999.ebuild to use systemd-resolved's stub resolver
This commit is contained in:
commit
29ba53843b
@ -193,16 +193,6 @@ src_prepare() {
|
|||||||
# Flatcar: We carry our own patches, we don't use the ones
|
# Flatcar: We carry our own patches, we don't use the ones
|
||||||
# from Gentoo. Thus we dropped the `if ! use vanilla` code
|
# from Gentoo. Thus we dropped the `if ! use vanilla` code
|
||||||
# here.
|
# 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
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user