From 3460d4cd12d36bdb12f4c32b5e45a9729a8e5779 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Wed, 20 Feb 2013 06:31:55 +0100 Subject: [PATCH] Remove shutdown policy. Shutdown is now a symlink to systemctl. --- modules-mls-contrib.conf | 7 ------- modules-targeted-contrib.conf | 7 ------- selinux-policy.spec | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/modules-mls-contrib.conf b/modules-mls-contrib.conf index 83ff8c37..f93bd1bd 100644 --- a/modules-mls-contrib.conf +++ b/modules-mls-contrib.conf @@ -1300,13 +1300,6 @@ setroubleshoot = module # shorewall = module -# Layer: admin -# Module: shutdown -# -# Policy for shutdown -# -shutdown = module - # Layer: apps # Module: slocate # diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf index d08ca0b5..3892c693 100644 --- a/modules-targeted-contrib.conf +++ b/modules-targeted-contrib.conf @@ -1775,13 +1775,6 @@ sge = module # shorewall = module -# Layer: admin -# Module: shutdown -# -# Policy for shutdown -# -shutdown = module - # Layer: apps # Module: slocate # diff --git a/selinux-policy.spec b/selinux-policy.spec index 6429a62e..8f817132 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -252,7 +252,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 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 ) \ /usr/sbin/semodule -B -n -s %2; \ else \ touch /etc/selinux/%2/modules/active/modules/sandbox.disabled \