From 6e9f07d2e3fbe49036b37cb2b8c987a793992a61 Mon Sep 17 00:00:00 2001 From: Miroslav Grepl Date: Mon, 7 Jan 2013 14:54:04 +0100 Subject: [PATCH] Revert "Upstream change:" This reverts commit 0368b4c345dae1d331d12d6daceb8ccdea153102. --- modules-targeted-contrib.conf | 2 +- selinux-policy.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf index 78f2ed60..d0a4ede1 100644 --- a/modules-targeted-contrib.conf +++ b/modules-targeted-contrib.conf @@ -858,7 +858,7 @@ iscsi = module # # # -isns = module +isnsd = module # Layer: services # Module: jabber diff --git a/selinux-policy.spec b/selinux-policy.spec index dd35a08b..629e7402 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 ctdbd.pp fcoemon.pp glusterd.pp isnsd.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 ctdbd.pp fcoemon.pp glusterd.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 ctdbd fcoemon glusterd isnsd 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 fcoemon glusterd 2>/dev/null; \ fi \ /usr/sbin/semodule -B -n -s %2; \ else \