summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Streetman <ddstreet@canonical.com>2020-09-17 16:43:45 -0400
committerDan Streetman <ddstreet@canonical.com>2020-09-17 16:43:45 -0400
commitdd4d93d94ebe2cf416f6b5a5eb59a16432cbc47b (patch)
tree8573155f2c5cf8554586aba35ed5009227a52ca3
parent5544fc0662dbe314a851f92c4977a62e63b08b0c (diff)
Fix resolved.conf Cache= to match actual default
LP: #1895418
-rw-r--r--debian/patches/lp1895418.patch22
-rw-r--r--debian/patches/series1
2 files changed, 23 insertions, 0 deletions
diff --git a/debian/patches/lp1895418.patch b/debian/patches/lp1895418.patch
new file mode 100644
index 0000000000..48c7c83e39
--- /dev/null
+++ b/debian/patches/lp1895418.patch
@@ -0,0 +1,22 @@
+From: Dan Streetman <ddstreet@canonical.com>
+Subject: fix resolved.conf Cache= default value
+Bug-Ubuntu: https://launchpad.net/bugs/1895418
+Forwarded: not-needed
+
+The actual default value was changed in the previous patch
+d/p/debian/UBUNTU-resolved-default-no-negative-caching.patch
+
+This only changes the commented-out value in the resolved.conf
+file so it matches the actual default
+
+--- systemd-246.4.orig/src/resolve/resolved.conf.in
++++ systemd-246.4/src/resolve/resolved.conf.in
+@@ -19,7 +19,7 @@
+ #DNSOverTLS=@DEFAULT_DNS_OVER_TLS_MODE@
+ #MulticastDNS=@DEFAULT_MDNS_MODE@
+ #LLMNR=@DEFAULT_LLMNR_MODE@
+-#Cache=yes
++#Cache=no-negative
+ #DNSStubListener=yes
+ #ReadEtcHosts=yes
+ #ResolveUnicastSingleLabel=no
diff --git a/debian/patches/series b/debian/patches/series
index 0a26700dba..6556a580fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,3 +45,4 @@ Revert-network-if-sys-is-rw-then-udev-should-be-around.patch
network-Set-link-state-to-LINK_STATE_PENDING-instead-of-t.patch
dhcp-Allow-setting-request-options-again.patch
lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch
+lp1895418.patch