From c25028a29f964fd7d62991c78a050bc9154ddb4f Mon Sep 17 00:00:00 2001
From: wangyuhang <wangyuhang27@huawei.com>
Date: Fri, 17 Jun 2022 14:57:16 +0800
Subject: [PATCH] revert rpm: restart services in %posttrans

(cherry picked from commit 33ece06c2d2797cfc3145d1fae3cb0852d7b5519)
---
 ...rt-rpm-restart-services-in-posttrans.patch | 33 +++++++++++++++++++
 systemd.spec                                  |  9 +++--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 revert-rpm-restart-services-in-posttrans.patch

diff --git a/revert-rpm-restart-services-in-posttrans.patch b/revert-rpm-restart-services-in-posttrans.patch
new file mode 100644
index 0000000..b76853f
--- /dev/null
+++ b/revert-rpm-restart-services-in-posttrans.patch
@@ -0,0 +1,33 @@
+From 3b2ba67cfc83905a88e3ebb88a2b43222a06e869 Mon Sep 17 00:00:00 2001
+From: wangyuhang <wangyuhang27@huawei.com>
+Date: Fri, 17 Jun 2022 14:26:16 +0800
+Subject: [PATCH] revert rpm: restart services in %posttrans
+Reason:In version 22.03, if we do not add 'systemctl reload or restart --marked' in 
+%transfiletriggerpostun, %systemd_postun_with_restart will not restart the 
+service. In order to maintain compatibility with version 20.03, revert the commit 
+and use the version 20.03 scheme
+
+Conflict:NA
+Reference:https://github.com/systemd/systemd/commit/fa97d2fcf64e0558054bee673f734f523373b146
+---
+ src/rpm/macros.systemd.in | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/rpm/macros.systemd.in b/src/rpm/macros.systemd.in
+index 3a0169a..8dae941 100644
+--- a/src/rpm/macros.systemd.in
++++ b/src/rpm/macros.systemd.in
+@@ -86,9 +86,7 @@ fi \
+ %{expand:%%{?__systemd_someargs_%#:%%__systemd_someargs_%# systemd_postun_with_restart}} \
+ if [ $1 -ge 1 ] && [ -x %{_bindir}/systemctl ]; then \
+     # Package upgrade, not uninstall \
+-    for unit in %{?*}; do \
+-         %{_bindir}/systemctl set-property $unit Markers=+needs-restart || : \
+-    done \
++    %{_bindir}/systemctl try-restart %{?*} || : \
+ fi \
+ %{nil}
+ 
+-- 
+2.33.0
+
diff --git a/systemd.spec b/systemd.spec
index c9684e5..0de4da8 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -20,7 +20,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        249
-Release:        27
+Release:        28
 License:        MIT and LGPLv2+ and GPLv2+
 Summary:        System and Service Manager
 
@@ -73,6 +73,7 @@ Patch0024:      systemd-solve-that-rsyslog-reads-journal-s-object-of.patch
 Patch0025:      check-whether-command_prev-is-null-before-assigning-.patch
 Patch0026:      print-the-real-reason-for-link-update.patch
 Patch0027:      core-skip-change-device-to-dead-in-manager_catchup-d.patch
+Patch0028:      revert-rpm-restart-services-in-posttrans.patch
 
 #backport
 Patch6000:      backport-core-fix-free-undefined-pointer-when-strdup-failed-i.patch
@@ -744,7 +745,7 @@ fi
 %systemd_post systemd-timesyncd.service
 
 %post udev
-fdevadm hwdb --update &>/dev/null
+udevadm hwdb --update &>/dev/null
 %systemd_post %udev_services
 %{_systemddir}/systemd-random-seed save 2>&1
 
@@ -1508,6 +1509,10 @@ fi
 %{_libdir}/security/pam_systemd.so
 
 %changelog
+* Fri Jun 17 2022 wangyuhang<wangyuhang27@huawei.com> -249-28
+- revert rpm: restart services in %posttrans
+  fix spelling errors in systemd.spec, fdev -> udev
+
 * Wed Jun 01 2022 licunlong<licunlong1@huawei.com> -249-27
 - move udev{rules, hwdb, program} to systemd-udev.