From 08af0db2a35f6339fa8e8ecda537b3452bb408b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 14 Oct 2022 16:18:53 +0200
Subject: [PATCH] Fix upgrade detection in %posttrans scriptlet (rhbz#2115094)

4047e4fb7bb76f2578989e98de276e9ceb4e94b9 got things very wrong.
The trick with "[ $1 -eq 1 ]" doesn't work for transaction triggers
because the argument is not provided by rpm. We need to use a state
file to propagate the information from %post to %posttrans.

(cherry picked from commit bab6dfc23a915a4daee2dc6b215df8171a66f2a5)
---
 systemd.spec | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/systemd.spec b/systemd.spec
index bc08dd4..9f4972c 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -920,6 +920,8 @@ fi
 [ $1 -eq 1 ] || exit 0
 # Initial installation
 
+touch %{_localstatedir}/lib/rpm-state/systemd-resolved.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
     echo "Skipping presets for systemd-resolved.service, seems we are upgrading from old systemd."
@@ -929,14 +931,17 @@ fi
 %systemd_post systemd-resolved.service
 
 %posttrans resolved
-[ $1 -eq 1 ] || exit 0
+[ -e %{_localstatedir}/lib/rpm-state/systemd-resolved.initial-installation ] || exit 0
+rm %{_localstatedir}/lib/rpm-state/systemd-resolved.initial-installation
 # 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
-# does not do this, because it's marked with ! and we don't specify --boot.)
-# https://bugzilla.redhat.com/show_bug.cgi?id=1873856
+# (https://bugzilla.redhat.com/show_bug.cgi?id=1873856)
+#
+# We would also create it using tmpfiles, but let's do this here too
+# before NetworkManager gets a chance. (systemd-tmpfiles invocation
+# above does not do this, because the line is marked with ! and
+# tmpfiles is invoked without --boot in the scriptlet.)
 #
 # *Create* the symlink if nothing is present yet.
 # (https://bugzilla.redhat.com/show_bug.cgi?id=2032085)