Revert "Upstream uses ctdb instead of ctdbd policy"

This reverts commit 1871109735.
This commit is contained in:
Miroslav Grepl 2013-01-07 14:54:40 +01:00
parent c57639b449
commit fdeb413467
2 changed files with 10 additions and 4 deletions

View File

@ -440,12 +440,18 @@ cpufreqselector = module
cron = module cron = module
# Layer: services # Layer: services
# Module: ctdb # Module: ctdbd
# #
# Cluster Daemon # Cluster Daemon
# #
ctdbd = module
ctdb = module # Layer: services
# Module: ctdbd
#
# ctdbd - The CTDB cluster daemon
#
ctdbd = module
# Layer: services # Layer: services
# Module: cups # Module: cups

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 ctdbd.pp 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 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 ctdbd 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 2>/dev/null; \
fi \ fi \
/usr/sbin/semodule -B -n -s %2; \ /usr/sbin/semodule -B -n -s %2; \
else \ else \