[selinux-policy/f18] We use consoletype policy anymore

[Miroslav Grepl]

commit 54cb7b7e74554166818ccd5a969cc4b507a251f9
Author: Miroslav Grepl <mgrepl at redhat.com>
Date:   Fri Dec 14 09:17:56 2012 +0100

    We use consoletype policy anymore

 modules-mls-base.conf         |    7 -------
 modules-targeted-base.conf    |    7 -------
 modules-targeted-contrib.conf |    2 --
 selinux-policy.spec           |    2 +-
 4 files changed, 1 insertions(+), 17 deletions(-)
---
diff --git a/modules-mls-base.conf b/modules-mls-base.conf
index 1840579..309a9f2 100644
--- a/modules-mls-base.conf
+++ b/modules-mls-base.conf
@@ -5,13 +5,6 @@
 # 
 bootloader = module
 
-# Layer: admin
-# Module: consoletype
-#
-# Determine of the console connected to the controlling terminal.
-# 
-consoletype = module
-
 # Layer: kernel
 # Module: corenetwork
 # Required in base
diff --git a/modules-targeted-base.conf b/modules-targeted-base.conf
index 8ee8ec9..09c9b66 100644
--- a/modules-targeted-base.conf
+++ b/modules-targeted-base.conf
@@ -5,13 +5,6 @@
 # 
 bootloader = module
 
-# Layer: admin
-# Module: consoletype
-#
-# Determine of the console connected to the controlling terminal.
-# 
-consoletype = module
-
 # Layer: kernel
 # Module: corecommands
 # Required in base
diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf
index da884a4..4e522bb 100644
--- a/modules-targeted-contrib.conf
+++ b/modules-targeted-contrib.conf
@@ -2284,5 +2284,3 @@ pki = module
 # policy for smsd
 #
 smsd = module
-
-consolekit = module
diff --git a/selinux-policy.spec b/selinux-policy.spec
index c5b5703..c1a5fcf 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -254,7 +254,7 @@ 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) \
    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 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 \
    /usr/sbin/semodule -B -n -s %2; \
 else \