From 39055121170430fa599f454533543cec89a79a58 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sep 29 2020 16:30:47 +0000
Subject: Upgrades: only replace NM /etc/resolv.conf if NM is enabled


---

diff --git a/systemd.spec b/systemd.spec
index cb80d2d..a885798 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -684,7 +684,9 @@ fi
 # This is for upgrades from previous versions before systemd-resolved became the default.
 systemctl --no-reload preset systemd-resolved.service &>/dev/null || :
 
-if systemctl is-enabled systemd-resolved.service &>/dev/null; then
+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 && \
   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 && \