|
 |
a13ffa |
From 0d571e36878fb42fc9e024bc52a6fa439d707d2c Mon Sep 17 00:00:00 2001
|
|
|
a13ffa |
From: Miroslav Grepl <mgrepl@redhat.com>
|
|
|
a13ffa |
Date: Fri, 16 May 2014 15:14:37 +0200
|
|
|
a13ffa |
Subject: [PATCH 4/5] Make fixfiles_exclude_dirs working if there is a
|
|
|
a13ffa |
substituion for the given directory
|
|
|
a13ffa |
|
|
|
a13ffa |
---
|
|
|
a13ffa |
policycoreutils/scripts/fixfiles | 9 ++++++++-
|
|
|
a13ffa |
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
a13ffa |
|
|
|
a13ffa |
diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles
|
|
|
a13ffa |
index 5c29eb9..df4298a 100755
|
|
|
a13ffa |
--- a/policycoreutils/scripts/fixfiles
|
|
|
a13ffa |
+++ b/policycoreutils/scripts/fixfiles
|
|
|
a13ffa |
@@ -137,6 +137,9 @@ else
|
|
|
a13ffa |
FC=/etc/security/selinux/file_contexts
|
|
|
a13ffa |
fi
|
|
|
a13ffa |
|
|
|
a13ffa |
+FC_SUB_DIST=${FC}.subs_dist
|
|
|
a13ffa |
+FC_SUB=${FC}.subs
|
|
|
a13ffa |
+
|
|
|
a13ffa |
#
|
|
|
a13ffa |
# Log to either syslog or a LOGFILE
|
|
|
a13ffa |
#
|
|
|
a13ffa |
@@ -243,6 +246,10 @@ then
|
|
|
a13ffa |
logit "skipping the directory ${p}"
|
|
|
a13ffa |
done
|
|
|
a13ffa |
FC=$TEMPFCFILE
|
|
|
a13ffa |
+/bin/cp -p ${TEMPFCFILE} ${TEMPFCFILE}.subs_dist &>/dev/null || exit
|
|
|
a13ffa |
+/bin/cp -p ${FC_SUB_DIST} ${TEMPFCFILE}.subs_dist &>/dev/null || exit
|
|
|
a13ffa |
+/bin/cp -p ${TEMPFCFILE} ${TEMPFCFILE}.subs &>/dev/null || exit
|
|
|
a13ffa |
+/bin/cp -p ${FC_SUB} ${TEMPFCFILE}.subs &>/dev/null || exit
|
|
|
a13ffa |
fi
|
|
|
a13ffa |
if [ ! -z "$RPMFILES" ]; then
|
|
|
a13ffa |
for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
|
|
|
a13ffa |
@@ -264,7 +271,7 @@ if [ ${OPTION} != "Relabel" ]; then
|
|
|
a13ffa |
return
|
|
|
a13ffa |
fi
|
|
|
a13ffa |
echo "Cleaning up labels on /tmp"
|
|
|
a13ffa |
-rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* $TEMPFCFILE
|
|
|
a13ffa |
+rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* $TEMPFCFILE ${TEMPFCFILE}.subs_dist ${TEMPFCFILE}.subs
|
|
|
a13ffa |
|
|
|
a13ffa |
UNDEFINED=`get_undefined_type` || exit $?
|
|
|
a13ffa |
UNLABELED=`get_unlabeled_type` || exit $?
|
|
|
a13ffa |
--
|
|
|
a13ffa |
2.1.0
|
|
|
a13ffa |
|