[selinux-policy] Upstream uses ctdb instead of ctdbd policy

[Miroslav Grepl]

commit 1871109735a0dcfc3fedade6afbcf743007e678f
Author: Miroslav Grepl <mgrepl at redhat.com>
Date:   Mon Jan 7 00:11:42 2013 +0100

    Upstream uses ctdb instead of ctdbd policy

 modules-targeted-contrib.conf |   10 ++--------
 selinux-policy.spec           |    4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf
index 4e522bb..50d128b 100644
--- a/modules-targeted-contrib.conf
+++ b/modules-targeted-contrib.conf
@@ -440,18 +440,12 @@ cpufreqselector = module
 cron = module
 
 # Layer: services
-# Module: ctdbd
+# Module: ctdb
 #
 # Cluster Daemon
 # 
-ctdbd = module
 
-# Layer: services
-# Module: ctdbd
-#
-# ctdbd - The CTDB cluster daemon
-#
-ctdbd = module
+ctdb = module
 
 # Layer: services
 # Module: cups
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 28c5e3d..5030dca 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -252,9 +252,9 @@ fi;
 . %{_sysconfdir}/selinux/config; \
 if [ -e /etc/selinux/%2/.rebuild ]; then \
    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 qemu.pp nsplugin.pp razor.pp pyzord.pp phpfpm.pp hotplug.pp consoletype.pp kudzu.pp howl.pp) \
    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 2>/dev/null; \
    fi \
    /usr/sbin/semodule -B -n -s %2; \
 else \