From 59421a6c70da5d7cef91f6ffeeef842e32b65cb4 Mon Sep 17 00:00:00 2001
From: Miroslav Grepl <mgrepl@redhat.com>
Date: Fri, 1 Mar 2013 14:05:44 +0100
Subject: [PATCH] Remove rgmanager,pacemaker,aisexec,pacemaker policies which
 have been merge to rhcs.pp as cluster_t

---
 modules-mls-contrib.conf      | 21 ---------------------
 modules-targeted-contrib.conf | 35 -----------------------------------
 selinux-policy.spec           |  2 +-
 3 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/modules-mls-contrib.conf b/modules-mls-contrib.conf
index f93bd1bd..1784416b 100644
--- a/modules-mls-contrib.conf
+++ b/modules-mls-contrib.conf
@@ -25,13 +25,6 @@ afs = module
 # Policy for aide
 # 
 aide = module
-
-# Layer: services
-# Module: aisexec
-#
-# RHCS - Red Hat Cluster Suite
-#
-aisexec = module
  
 # Layer: admin
 # Module: alsa
@@ -285,13 +278,6 @@ comsat = module
 # 
 #consolekit = module
 
-# Layer: services
-# Module: corosync
-#
-# Corosync Cluster Engine Executive
-# 
-corosync = module
-
 # Layer: services
 # Module: courier
 #
@@ -1153,13 +1139,6 @@ readahead = module
 # 
 remotelogin = module
 
-# Layer: services
-# Module: rgmanager
-#
-# Red Hat Resource Group Manager
-#
-rgmanager = module
-
 # Layer: services
 # Module: rhcs
 #
diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf
index 3892c693..e88980af 100644
--- a/modules-targeted-contrib.conf
+++ b/modules-targeted-contrib.conf
@@ -39,13 +39,6 @@ aiccu = module
 # Policy for aide
 # 
 aide = module
-
-# Layer: services
-# Module: aisexec
-#
-# RHCS - Red Hat Cluster Suite
-#
-aisexec = module
  
 # Layer: services
 # Module: ajaxterm
@@ -384,13 +377,6 @@ condor = module
 # 
 consolekit = module
 
-# Layer: services
-# Module: corosync
-#
-# Corosync Cluster Engine Executive
-# 
-corosync = module
-
 # Layer: services
 # Module: couchdb
 #
@@ -1279,13 +1265,6 @@ openvpn = module
 #
 openvswitch = module
 
-# Layer: services
-# Module: pacemaker
-#
-# pacemaker
-#
-pacemaker = module
-
 prelude = module
 
 # Layer: services
@@ -1558,20 +1537,6 @@ realmd = module
 # 
 remotelogin = module
 
-# Layer: services
-# Module: rgmanager
-#
-# Red Hat Resource Group Manager
-#
-rgmanager = module
-
-# Layer: services
-# Module: rgmanager
-#
-# rgmanager
-# 
-rgmanager = module
-
 # Layer: services
 # Module: rhcs
 #
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 835adda3..befc8b63 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -253,7 +253,7 @@ 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 shutdown.pp amavis.pp clamav.pp gnomeclock.pp matahari.pp xfs.pp kudzu.pp kerneloops.pp execmem.pp openoffice.pp ada.pp tzdata.pp hal.pp hotplug.pp howl.pp java.pp mono.pp moilscanner.pp gamin.pp audio_entropy.pp audioentropy.pp iscsid.pp polkit_auth.pp polkit.pp rtkit_daemon.pp ModemManager.pp telepathysofiasip.pp ethereal.pp passanger.pp qpidd.pp pyzor.pp razor.pp pki-selinux.pp phpfpm.pp consoletype.pp ctdbd.pp fcoemon.pp isnsd.pp l2tp.pp ) \
+   (cd /etc/selinux/%2/modules/active/modules; rm -f shutdown.pp amavis.pp clamav.pp gnomeclock.pp matahari.pp xfs.pp kudzu.pp kerneloops.pp execmem.pp openoffice.pp ada.pp tzdata.pp hal.pp hotplug.pp howl.pp java.pp mono.pp moilscanner.pp gamin.pp audio_entropy.pp audioentropy.pp iscsid.pp polkit_auth.pp polkit.pp rtkit_daemon.pp ModemManager.pp telepathysofiasip.pp ethereal.pp passanger.pp qpidd.pp pyzor.pp razor.pp pki-selinux.pp phpfpm.pp consoletype.pp ctdbd.pp fcoemon.pp isnsd.pp l2tp.pp rgmanager.pp corosync.pp aisexec.pp pacemaker.pp ) \
    /usr/sbin/semodule -B -n -s %2; \
 else \
     touch /etc/selinux/%2/modules/active/modules/sandbox.disabled \