SLFO-pool/selinux-policy
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main selinux-policy revision 447c7b6c983a95fc4cd4720057f687b6

Browse Source
This commit is contained in:
Adrian Schröter 2024-09-06 15:31:19 +02:00
parent b454af874d
commit efafe4eac5
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
macros.selinux-policy
View File

@ -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}

10
selinux-policy.changes
View File

@ -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