diff --git a/0001-Document-some-reasonable-DNS-servers-in-the-example-.patch b/0001-Document-some-reasonable-DNS-servers-in-the-example-.patch new file mode 100644 index 0000000..535fdfc --- /dev/null +++ b/0001-Document-some-reasonable-DNS-servers-in-the-example-.patch @@ -0,0 +1,34 @@ +From b6c05e03c2e6e98e2f0f129ff5256780bb65bdb2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 6 Oct 2020 13:59:25 +0200 +Subject: [PATCH] Document some reasonable DNS servers in the example config + file + +We have an option to set the fallback list, so we don't know what the contents +are. It may in fact be empty. Let's add some examples to make it easy for a user +stranded without any DNS to fill in something that would work. As a bonus, this +also gives names to the entries we provide by default. +(I added google and cloudflare because that's what we have currently, and quad9 +because it seems to be a good privacy-concious and fast choice and was requested +in #12499. As a minimum, things we should include should be well-known global +services with a documented privacy policy and both IPv4 and IPv6 support and +decent response times.) +--- + src/resolve/resolved.conf.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in +index 082ad71626..514021792f 100644 +--- a/src/resolve/resolved.conf.in ++++ b/src/resolve/resolved.conf.in +@@ -12,6 +12,10 @@ + # See resolved.conf(5) for details + + [Resolve] ++# Some examples of DNS servers which may be used for DNS= and FallbackDNS=: ++# Cloudflare: 1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001 ++# Google: 8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844 ++# Quad9: 9.9.9.9 2620:fe::fe + #DNS= + #FallbackDNS=@DNS_SERVERS@ + #Domains= diff --git a/systemd.spec b/systemd.spec index 538f19b..ee64d30 100644 --- a/systemd.spec +++ b/systemd.spec @@ -78,6 +78,7 @@ Patch0005: 0004-test-path-use-Type-exec.patch Patch0006: 0001-test-acl-util-output-more-debug-info.patch Patch0007: 0001-Do-not-assert-in-test_add_acls_for_user.patch +Patch0008: 0001-Document-some-reasonable-DNS-servers-in-the-example-.patch Patch0009: https://github.com/systemd/systemd/pull/17050/commits/f58b96d3e8d1cb0dd3666bc74fa673918b586612.patch @@ -369,6 +370,7 @@ CONFIGURE_OPTS=( -Dsysvinit-path=/etc/rc.d/init.d -Drc-local=/etc/rc.d/rc.local -Dntp-servers='0.%{ntpvendor}.pool.ntp.org 1.%{ntpvendor}.pool.ntp.org 2.%{ntpvendor}.pool.ntp.org 3.%{ntpvendor}.pool.ntp.org' + -Ddns-servers= -Duser-path=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin -Dservice-watchdog= -Ddev-kvm-mode=0666