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

Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy

Browse Source
This commit is contained in:
Dan Walsh 2013-01-07 08:44:03 -05:00
commit 3ba95111e0
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules-targeted-contrib.conf
View File

@ -440,18 +440,12 @@ cpufreqselector = module
cron = module cron = module
# Layer: services # Layer: services
# Module: ctdbd # Module: ctdb
# #
# Cluster Daemon # Cluster Daemon
# #
ctdbd = module
# Layer: services ctdb = module
# Module: ctdbd
#
# ctdbd - The CTDB cluster daemon
#
ctdbd = module
# Layer: services # Layer: services
# Module: cups # Module: cups
@ -643,11 +637,11 @@ exim = module
fail2ban = module fail2ban = module
# Layer: services # Layer: services
# Module: fcoemon # Module: fcoe
# #
# fcoemon # fcoe
# #
fcoemon = module fcoe = module
# Layer: services # Layer: services
# Module: fetchmail # Module: fetchmail
@ -738,7 +732,7 @@ glance = module
# #
# policy for glusterd service # policy for glusterd service
# #
glusterd = module glusterfs = module
# Layer: services # Layer: services
# Module: gnomeclock # Module: gnomeclock
@ -864,7 +858,7 @@ iscsi = module
# #
# #
# #
isnsd = module isns = module
# Layer: services # Layer: services
# Module: jabber # Module: jabber

4
selinux-policy.spec
View File

@ -252,9 +252,9 @@ fi;
. %{_sysconfdir}/selinux/config; \ . %{_sysconfdir}/selinux/config; \
if [ -e /etc/selinux/%2/.rebuild ]; then \ if [ -e /etc/selinux/%2/.rebuild ]; then \
rm /etc/selinux/%2/.rebuild; \ rm /etc/selinux/%2/.rebuild; \
(cd /etc/selinux/%2/modules/active/modules; rm -f qemu.pp nsplugin.pp razor.pp pyzord.pp phpfpm.pp hotplug.pp consoletype.pp kudzu.pp howl.pp) \ (cd /etc/selinux/%2/modules/active/modules; rm -f ctdbd.pp fcoemon.pp glusterd.pp isnsd.pp qemu.pp nsplugin.pp razor.pp pyzord.pp phpfpm.pp hotplug.pp consoletype.pp kudzu.pp howl.pp) \
if [ %1 -ne 1 ]; then \ if [ %1 -ne 1 ]; then \
/usr/sbin/semodule -n -s %2 -r matahari xfs kudzu kerneloops execmem openoffice ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy audioentropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd pyzor razor pki-selinux phpfpm consoletype 2>/dev/null; \ /usr/sbin/semodule -n -s %2 -r matahari xfs kudzu kerneloops execmem openoffice ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy audioentropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd pyzor razor pki-selinux phpfpm consoletype ctdbd fcoemon glusterd isnsd 2>/dev/null; \
fi \ fi \
/usr/sbin/semodule -B -n -s %2; \ /usr/sbin/semodule -B -n -s %2; \
else \ else \