From 778a3758dd9dac94898937effb7707515c836bbb Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jul 12 2020 20:55:01 +0000
Subject: Drop patch to avoid creation of /etc/resolv.conf symlink


---

diff --git a/0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
deleted file mode 100644
index f4cd87c..0000000
--- a/0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0c670fec00f3d5c103d9b7415d4e0510c61ad006 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Fri, 11 Mar 2016 17:06:17 -0500
-Subject: [PATCH] resolved: create /etc/resolv.conf symlink at runtime
-
-If the symlink exists, do nothing. In particular, if it is a broken symlink,
-we cannot really know if the administator configured it to point to
-a location used by some service that hasn't started yet, so we
-don't touch it in that case either.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1313085
----
- src/resolve/resolved.c | 4 ++++
- tmpfiles.d/etc.conf.m4 | 3 ---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
-index f82e0b82ce..66a777bdb2 100644
---- a/tmpfiles.d/etc.conf.m4
-+++ b/tmpfiles.d/etc.conf.m4
-@@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts
- m4_ifdef(`HAVE_SMACK_RUN_LABEL',
- t /etc/mtab - - - - security.SMACK64=_
- )m4_dnl
--m4_ifdef(`ENABLE_RESOLVE',
--L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf
--)m4_dnl
- C! /etc/nsswitch.conf - - - -
- m4_ifdef(`HAVE_PAM',
- C! /etc/pam.d - - - -
diff --git a/systemd.spec b/systemd.spec
index acd2244..8dd900d 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -70,8 +70,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[
 # https://bugzilla.redhat.com/show_bug.cgi?id=1738828
 Patch0001:      use-bfq-scheduler.patch
 
-Patch0998:      0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
-
 %ifarch %{ix86} x86_64 aarch64
 %global have_gnu_efi 1
 %endif