From b245c5acfdfbde1e02d5f864d613ef85090032f1 Mon Sep 17 00:00:00 2001
From: Anita Zhang <the.anitazha@gmail.com>
Date: Apr 14 2021 17:50:22 +0000
Subject: 247.3-10: remove systemd-resolved enablement


---

diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 3df14e0..c6bb199 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -26,7 +26,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        247.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        System and Service Manager
@@ -766,22 +766,6 @@ if [ $1 -eq 0 ] ; then
                 >/dev/null || :
 fi
 
-%triggerun -- systemd < 246.1-1
-# This is for upgrades from previous versions before systemd-resolved became the default.
-systemctl --no-reload preset systemd-resolved.service &>/dev/null || :
-
-if systemctl -q is-enabled systemd-resolved.service &>/dev/null; then
-  systemctl -q is-enabled NetworkManager.service 2>/dev/null && \
-  ! test -L /etc/resolv.conf 2>/dev/null && \
-  ! mountpoint /etc/resolv.conf &>/dev/null && \
-  grep -q 'Generated by NetworkManager' /etc/resolv.conf 2>/dev/null && \
-  echo -e '/etc/resolv.conf was generated by NetworkManager.\nRemoving it to let systemd-resolved manage this file.' && \
-  mv -v /etc/resolv.conf /etc/resolv.conf.orig-with-nm && \
-  ln -sv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf 2>/dev/null || :
-
-  systemctl start systemd-resolved.service &>/dev/null || :
-fi
-
 %post libs
 %{?ldconfig}
 
@@ -792,12 +776,6 @@ function mod_nss() {
         sed -i.bak -r -e '
                 s/^(passwd|group):(.*)/\1:\2 systemd/
                 ' "$1" &>/dev/null || :
-
-        # Add nss-resolve to hosts
-        grep -E -q '^hosts:.* resolve' "$1" ||
-        sed -i.bak -r -e '
-                s/^(hosts):(.*) files( mdns4_minimal .NOTFOUND=return.)? dns myhostname/\1:\2 files\3 resolve [!UNAVAIL=return] myhostname dns/
-                ' "$1" &>/dev/null || :
     fi
 }
 
@@ -957,6 +935,9 @@ fi
 %endif
 
 %changelog
+* Wed Apr 14 2021 Anita Zhang <anitazha@fb.com> - 247.3-10
+- Remove systemd-resolved enablement
+
 * Wed Apr  7 2021 Davide Cavalca <dcavalca@fb.com> - 247.3-9
 - Reenable LTO now that binutils has been fixed
 - Update FB configure options