Blob Blame History Raw
commit 36883e30182f443d8c93905748fd059c6c480a58
Author: Petr Lautrbach <plautrba@redhat.com>
Date:   Sat Jul 4 11:10:58 2015 +0200

    fixfiles: Cover file_context.XXX.homedir
    
    We need to cover file_context.XXX.homedir to have fixfiles with
    exclude_dirs working correctly.
    
    From github fedora-selinux/selinux:
    40f8d680431e3e4f59e276455ff660c57dab2c3e
    afe098c7201d274dcbea6ef4d5465a702e3c1271
    2a0a68edde30f4e3254dcee63a892de1aa6ab69a
    
    Resolves: rhbz#1186640

diff --git a/scripts/fixfiles b/scripts/fixfiles
index df4298a..7a158d1 100755
--- a/scripts/fixfiles
+++ b/scripts/fixfiles
@@ -139,7 +139,7 @@ fi
 
 FC_SUB_DIST=${FC}.subs_dist
 FC_SUB=${FC}.subs
-
+FC_HOMEDIRS=${FC}.homedirs
 #
 # Log to either syslog or a LOGFILE
 #
@@ -246,10 +246,10 @@ then
 		logit "skipping the directory ${p}"
 	done
 FC=$TEMPFCFILE
-/bin/cp -p ${TEMPFCFILE} ${TEMPFCFILE}.subs_dist &>/dev/null || exit
 /bin/cp -p ${FC_SUB_DIST} ${TEMPFCFILE}.subs_dist &>/dev/null || exit
-/bin/cp -p ${TEMPFCFILE} ${TEMPFCFILE}.subs &>/dev/null || exit
 /bin/cp -p ${FC_SUB} ${TEMPFCFILE}.subs &>/dev/null || exit
+/bin/cp -p ${FC_HOMEDIRS} ${TEMPFCFILE}.homedirs &>/dev/null || exit
+
 fi
 if [ ! -z "$RPMFILES" ]; then
     for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
@@ -271,7 +271,7 @@ if [ ${OPTION} != "Relabel" ]; then
     return
 fi
 echo "Cleaning up labels on /tmp"
-rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* $TEMPFCFILE ${TEMPFCFILE}.subs_dist ${TEMPFCFILE}.subs
+rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* $TEMPFCFILE ${TEMPFCFILE}.subs_dist ${TEMPFCFILE}.subs ${TEMPFCFILE}.homedirs
 
 UNDEFINED=`get_undefined_type` || exit $?
 UNLABELED=`get_unlabeled_type` || exit $?