From efafe4eac5bc0c64ce344c50acfc967719cf698d406c2cd8502109474f19a2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 6 Sep 2024 15:31:19 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main selinux-policy revision
 447c7b6c983a95fc4cd4720057f687b6

---
 macros.selinux-policy  | 12 ++++++++++--
 selinux-policy.changes | 10 ++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/macros.selinux-policy b/macros.selinux-policy
index 77f8aa9..0a55d69 100644
--- a/macros.selinux-policy
+++ b/macros.selinux-policy
@@ -60,7 +60,11 @@ if [ -z "${_policytype}" ]; then \
 fi \
 if [ "${SELINUXTYPE}" = "${_policytype}" ]; then \
   %{_sbindir}/semodule -n -s ${_policytype} -X %{!-p:200}%{-p*} -i %* || : \
-  %{_sbindir}/selinuxenabled && %{_sbindir}/load_policy || : \
+  if %{_sbindir}/selinuxenabled; then \
+    if [ -z "${TRANSACTIONAL_UPDATE}" ]; then \
+      %{_sbindir}/load_policy || : \
+    fi \
+  fi \
 fi \
 %{nil}
 
@@ -76,7 +80,11 @@ fi \
 if [ $1 -eq 0 ]; then \
   if [ "${SELINUXTYPE}" = "${_policytype}" ]; then \
     %{_sbindir}/semodule -n -X %{!-p:200}%{-p*} -s ${_policytype} -r %* &> /dev/null || : \
-    %{_sbindir}/selinuxenabled && %{_sbindir}/load_policy || : \
+    if %{_sbindir}/selinuxenabled; then \
+      if [ -z "${TRANSACTIONAL_UPDATE}" ]; then \
+        %{_sbindir}/load_policy || : \
+      fi \
+    fi \
   fi \
 fi \
 %{nil}
diff --git a/selinux-policy.changes b/selinux-policy.changes
index 97125c6..27bd0b4 100644
--- a/selinux-policy.changes
+++ b/selinux-policy.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Sep  4 13:07:52 UTC 2024 - Cathy Hu <cathy.hu@suse.com>
+
+- Fix macros.selinux-policy (bsc#1229132)
+  - %selinux_modules_install and %selinux_modules_uninstall will
+    now only execute load_policy if $TRANSACTIONAL_UPDATE is not set
+    (aka only if they are not in a transactional system)
+  - $TRANSACTIONAL_UPDATE is set here:
+    https://github.com/openSUSE/transactional-update/blob/bd524d3ddfcd9aeebb7b90d3e0e8eed09b796a86/lib/Transaction.cpp#L428
+
 -------------------------------------------------------------------
 Thu Aug 15 14:24:41 UTC 2024 - cathy.hu@suse.com