[selinux-policy: 1/2] Cover up errors if .config dir does not exist, no need to run restorecon twice
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Feb 28 15:04:26 UTC 2013
commit 0aef6e5668d8521f3ccb019dec51370daca80937
Author: Dan Walsh <dwalsh at redhat.com>
Date: Thu Feb 28 10:04:00 2013 -0500
Cover up errors if .config dir does not exist, no need to run restorecon twice
selinux-policy.spec | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 66bfbda..1e30a09 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -26,7 +26,6 @@ Source: serefpolicy-%{version}.tgz
patch: policy-rawhide-base.patch
patch1: policy-rawhide-contrib.patch
patch2: policy_contrib-rawhide-roleattribute.patch
-patch3: policy-rawhide-roleattribute.patch
Source1: modules-targeted-base.conf
Source31: modules-targeted-contrib.conf
Source2: booleans-targeted.conf
@@ -229,10 +228,9 @@ FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
if [ $? = 0 -a "${SELINUXTYPE}" = %1 -a -f ${FILE_CONTEXT}.pre ]; then \
/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null; \
rm -f ${FILE_CONTEXT}.pre; \
- /sbin/restorecon -R /home/*/.cache /home/*/.config; \
fi; \
/sbin/restorecon -e /run/media -R /root /var/log /var/run /etc/passwd* /etc/group* /etc/*shadow* 2> /dev/null; \
-/sbin/restorecon -R /home/*/.cache /home/*/.config;
+/sbin/restorecon -R /home/*/.cache /home/*/.config 2> /dev/null
%define preInstall() \
if [ $1 -ne 1 ] && [ -s /etc/selinux/config ]; then \
More information about the scm-commits
mailing list