rpms/selinux-policy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop removeVarrunModule macro

Browse Source 
- use only removeVarrunModuleLua
- drop unknown %triggerpostin triggers

[skip changelog]

Related: RHEL-54303
This commit is contained in:
Petr Lautrbach 2024-05-21 14:01:06 +02:00
parent f5ea95981c
commit a6a5f1a3aa
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
selinux-policy.spec
View File

@ -413,11 +413,6 @@ if posix.stat(config_file) then \
end end
# Remove the local_varrun SELinux module # Remove the local_varrun SELinux module
%define removeVarrunModule() \
if [ -r "%{_sharedstatedir}/selinux/%1/active/modules/400/extra_varrun/cil" ]; then \
%{_bindir}/rm -rf %{_sharedstatedir}/selinux/%1/active/modules/400/extra_varrun \
fi;
%define removeVarrunModuleLua() \ %define removeVarrunModuleLua() \
if posix.access ("%{_sharedstatedir}/selinux/%1/active/modules/400/extra_varrun/cil", "r") then \ if posix.access ("%{_sharedstatedir}/selinux/%1/active/modules/400/extra_varrun/cil", "r") then \
os.execute ("%{_bindir}/rm -rf %{_sharedstatedir}/selinux/%1/active/modules/400/extra_varrun") \ os.execute ("%{_bindir}/rm -rf %{_sharedstatedir}/selinux/%1/active/modules/400/extra_varrun") \
@ -636,21 +631,11 @@ exit 0
%{_sbindir}/selinuxenabled && %{_sbindir}/semodule -nB 2> /dev/null %{_sbindir}/selinuxenabled && %{_sbindir}/semodule -nB 2> /dev/null
exit 0 exit 0
%triggerprein -- container-selinux %triggerprein -p <lua> -- container-selinux
%removeVarrunModule targeted %removeVarrunModuleLua targeted
exit 0
%triggerprein -- pcp-selinux %triggerprein -p <lua> -- pcp-selinux
%removeVarrunModule targeted %removeVarrunModuleLua targeted
exit 0
%triggerpostin -- container-selinux
%{_libexecdir}/selinux/varrun-convert.sh targeted
exit 0
%triggerpostin -- pcp-selinux
%{_libexecdir}/selinux/varrun-convert.sh targeted
exit 0
%triggerpostun -- selinux-policy-targeted < 3.12.1-74 %triggerpostun -- selinux-policy-targeted < 3.12.1-74
rm -f %{_sysconfdir}/selinux/*/modules/active/modules/sandbox.pp.disabled 2>/dev/null rm -f %{_sysconfdir}/selinux/*/modules/active/modules/sandbox.pp.disabled 2>/dev/null