Drop fix-resolved-detection.patch: Applied

2 files changed, 0 insertions, 23 deletions

diff --git a/debian/patches/fix-resolved-detection.patch b/debian/patches/fix-resolved-detection.patch
deleted file mode 100644
index 81f1101c..00000000
--- a/debian/patches/fix-resolved-detection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix resolved detection, add stub-resolv.conf support
- Fix resolved detection, the symlink target is usually relative to the
- root, such that in chroots the file points to a file inside the
- chroot. But keep absolute targets too, as these may have been in use
- with older version of systemd.  Add support for stub-resolv.conf
- detection.
-Author: Dimitri John Ledkov <xnox@ubuntu.com>
-
---- network-manager-1.8.2.orig/src/dns/nm-dns-manager.c
-+++ network-manager-1.8.2/src/dns/nm-dns-manager.c
-@@ -1645,6 +1645,11 @@ static gboolean
- _resolvconf_resolved_managed (void)
- {
- 	static const char *const RESOLVED_PATHS[] = {
-+		"../run/systemd/resolve/stub-resolv.conf",
-+		"../run/systemd/resolve/resolv.conf",
-+		"../lib/systemd/resolv.conf",
-+		"../usr/lib/systemd/resolv.conf",
-+		"/run/systemd/resolve/stub-resolv.conf",
- 		"/run/systemd/resolve/resolv.conf",
- 		"/lib/systemd/resolv.conf",
- 		"/usr/lib/systemd/resolv.conf",
diff --git a/debian/patches/series b/debian/patches/series
index 6d4ee745..08302ead 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ Disable-general-with-expect.patch
 libnm-Check-self-still-NMManager-or-not.patch
 #dns-manager-don-t-merge-split-DNS-search-domains.patch
 Read-system-connections-from-run.patch
-fix-resolved-detection.patch