From 5be6189564aed0067bfa363c9b3ca4e44d80a745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 12 Apr 2022 09:50:37 +0200
Subject: [PATCH] Do not touch /etc/resolv.conf on upgrades

(cherry-picked from 4047e4fb7bb76f2578989e98de276e9ceb4e94b9)
---
 systemd.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/systemd.spec b/systemd.spec
index 312afb3..bc08dd4 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -31,7 +31,7 @@ Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 %if %{without inplace}
 Version:        250.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 %else
 # determine the build information from local checkout
 Version:        %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
@@ -917,7 +917,8 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %post resolved
-[ $1 -gt 1 ] && exit 0
+[ $1 -eq 1 ] || exit 0
+# Initial installation
 
 # Related to https://bugzilla.redhat.com/show_bug.cgi?id=1943263
 if ls /usr/lib/systemd/libsystemd-shared-24[0-8].so &>/dev/null; then
@@ -928,6 +929,9 @@ fi
 %systemd_post systemd-resolved.service
 
 %posttrans resolved
+[ $1 -eq 1 ] || exit 0
+# Initial installation
+
 # Create /etc/resolv.conf symlink.
 # We would also create it using tmpfiles, but let's do this here
 # too before NetworkManager gets a chance. (systemd-tmpfiles invocation above
@@ -1010,6 +1014,9 @@ fi
 %files standalone-sysusers -f .file-list-standalone-sysusers
 
 %changelog
+* Sun Jan 29 2023 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 250.9-2
+- Do not touch /etc/resolv.conf on upgrades (#2074122)
+
 * Tue Dec 20 2022 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 250.9-1
 - Latest bugfix release with a bunch of fixes (homed, networkd, manager,
   resolved, documentation): rhbz#2133792, rhbz#2135778, rhbz#2152685,