|
 |
f0c25a |
commit 36883e30182f443d8c93905748fd059c6c480a58
|
|
|
f0c25a |
Author: Petr Lautrbach <plautrba@redhat.com>
|
|
|
f0c25a |
Date: Sat Jul 4 11:10:58 2015 +0200
|
|
|
f0c25a |
|
|
|
f0c25a |
fixfiles: Cover file_context.XXX.homedir
|
|
|
f0c25a |
|
|
|
f0c25a |
We need to cover file_context.XXX.homedir to have fixfiles with
|
|
|
f0c25a |
exclude_dirs working correctly.
|
|
|
f0c25a |
|
|
|
f0c25a |
From github fedora-selinux/selinux:
|
|
|
f0c25a |
40f8d680431e3e4f59e276455ff660c57dab2c3e
|
|
|
f0c25a |
afe098c7201d274dcbea6ef4d5465a702e3c1271
|
|
|
f0c25a |
2a0a68edde30f4e3254dcee63a892de1aa6ab69a
|
|
|
f0c25a |
|
|
|
f0c25a |
Resolves: rhbz#1186640
|
|
|
f0c25a |
|
|
|
f0c25a |
diff --git a/scripts/fixfiles b/scripts/fixfiles
|
|
|
f0c25a |
index df4298a..7a158d1 100755
|
|
|
f0c25a |
--- a/scripts/fixfiles
|
|
|
f0c25a |
+++ b/scripts/fixfiles
|
|
|
f0c25a |
@@ -139,7 +139,7 @@ fi
|
|
|
f0c25a |
|
|
|
f0c25a |
FC_SUB_DIST=${FC}.subs_dist
|
|
|
f0c25a |
FC_SUB=${FC}.subs
|
|
|
f0c25a |
-
|
|
|
f0c25a |
+FC_HOMEDIRS=${FC}.homedirs
|
|
|
f0c25a |
#
|
|
|
f0c25a |
# Log to either syslog or a LOGFILE
|
|
|
f0c25a |
#
|
|
|
f0c25a |
@@ -246,10 +246,10 @@ then
|
|
|
f0c25a |
logit "skipping the directory ${p}"
|
|
|
f0c25a |
done
|
|
|
f0c25a |
FC=$TEMPFCFILE
|
|
|
f0c25a |
-/bin/cp -p ${TEMPFCFILE} ${TEMPFCFILE}.subs_dist &>/dev/null || exit
|
|
|
f0c25a |
/bin/cp -p ${FC_SUB_DIST} ${TEMPFCFILE}.subs_dist &>/dev/null || exit
|
|
|
f0c25a |
-/bin/cp -p ${TEMPFCFILE} ${TEMPFCFILE}.subs &>/dev/null || exit
|
|
|
f0c25a |
/bin/cp -p ${FC_SUB} ${TEMPFCFILE}.subs &>/dev/null || exit
|
|
|
f0c25a |
+/bin/cp -p ${FC_HOMEDIRS} ${TEMPFCFILE}.homedirs &>/dev/null || exit
|
|
|
f0c25a |
+
|
|
|
f0c25a |
fi
|
|
|
f0c25a |
if [ ! -z "$RPMFILES" ]; then
|
|
|
f0c25a |
for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
|
|
|
f0c25a |
@@ -271,7 +271,7 @@ if [ ${OPTION} != "Relabel" ]; then
|
|
|
f0c25a |
return
|
|
|
f0c25a |
fi
|
|
|
f0c25a |
echo "Cleaning up labels on /tmp"
|
|
|
f0c25a |
-rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* $TEMPFCFILE ${TEMPFCFILE}.subs_dist ${TEMPFCFILE}.subs
|
|
|
f0c25a |
+rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* $TEMPFCFILE ${TEMPFCFILE}.subs_dist ${TEMPFCFILE}.subs ${TEMPFCFILE}.homedirs
|
|
|
f0c25a |
|
|
|
f0c25a |
UNDEFINED=`get_undefined_type` || exit $?
|
|
|
f0c25a |
UNLABELED=`get_unlabeled_type` || exit $?
|