From 2528fa0969d600e5fe974d67dc6eea46ec739568 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Apr 02 2007 21:06:47 +0000 Subject: - Update to upstream --- diff --git a/selinux-policy.spec b/selinux-policy.spec index c20fca0..1814467 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -159,7 +159,8 @@ rm -f %{_sysconfdir}/selinux/%1/policy/policy.*.rpmnew %define relabel() \ . %{_sysconfdir}/selinux/config; \ FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \ -if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \ +selinuxenabled; \ +if [ $? == 0 -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \ fixfiles -C ${FILE_CONTEXT}.pre restore; \ rm -f ${FILE_CONTEXT}.pre; \ fi;