From c43a8c9a0f6a0139e094784472cb681b3e223945 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Aug 07 2023 12:56:38 +0000
Subject: Merge branch 'c9s-sig-hyperscale' into c8s-sig-hyperscale


---

diff --git a/systemd.spec b/systemd.spec
index 34d9e3b..fdd9537 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1280,6 +1280,7 @@ rm -f %{name}.lang
 * Mon Aug 07 2023 Daan De Meyer <daan.j.demeyer@gmail.com> - 253.5-1.1
 - Gate out systemd-selinux dependency on Facebook specific builds
 - Backport custom %clean implementation from rawhide
+- Backport selinux triggers logging revert from rawhide
 
 * Thu Aug 03 2023 Daan De Meyer <daan.j.demeyer@gmail.com> - 253.5-1.1
 - Replace bpftool version requirement patch with sed so it works across systemd
diff --git a/triggers.systemd b/triggers.systemd
index 719789b..f8bb078 100644
--- a/triggers.systemd
+++ b/triggers.systemd
@@ -17,11 +17,7 @@
 /usr/lib/systemd/systemd-update-helper system-reload-restart || :
 
 %transfiletriggerin -P 900899 -- /usr/lib/systemd/user /etc/systemd/user
-if selinuxenabled &>/dev/null; then
-  /usr/lib/systemd/systemd-update-helper user-reload-restart 2>/dev/null || :
-else
-  /usr/lib/systemd/systemd-update-helper user-reload-restart || :
-fi
+/usr/lib/systemd/systemd-update-helper user-reload-restart || :
 
 %transfiletriggerpostun -P 1000100 -- /usr/lib/systemd/system /etc/systemd/system
 # On removal, we need to run daemon-reload after any units have been
@@ -33,11 +29,7 @@ fi
 
 %transfiletriggerpostun -P 1000099 -- /usr/lib/systemd/user /etc/systemd/user
 # Execute daemon-reload in user managers.
-if selinuxenabled &>/dev/null; then
-  /usr/lib/systemd/systemd-update-helper user-reload 2>/dev/null || :
-else
-  /usr/lib/systemd/systemd-update-helper user-reload || :
-fi
+/usr/lib/systemd/systemd-update-helper user-reload || :
 
 %transfiletriggerpostun -P 10000 -- /usr/lib/systemd/system /etc/systemd/system
 # We restart remaining system services that should be restarted here.
@@ -45,11 +37,7 @@ fi
 
 %transfiletriggerpostun -P  9999 -- /usr/lib/systemd/user /etc/systemd/user
 # We restart remaining user services that should be restarted here.
-if selinuxenabled &>/dev/null; then
-  /usr/lib/systemd/systemd-update-helper user-restart 2>/dev/null || :
-else
-  /usr/lib/systemd/systemd-update-helper user-restart || :
-fi
+/usr/lib/systemd/systemd-update-helper user-restart || :
 
 %transfiletriggerin -P 1000700 -- /usr/lib/sysusers.d
 # This script will process files installed in /usr/lib/sysusers.d to create