diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.23.6/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2005-03-15 08:44:43.000000000 -0500 +++ policycoreutils-1.23.6/scripts/fixfiles 2005-04-29 10:40:15.000000000 -0400 @@ -24,6 +24,7 @@ # Set global Variables # fullFlag=0 +FORCEFLAG="" DIRS="" RPMILES="" OUTFILES="" @@ -108,16 +109,16 @@ fi if [ ! -z "$RPMFILES" ]; then for i in `echo $RPMFILES | sed 's/,/ /g'`; do - rpmlist $i | ${RESTORECON} ${OUTFILES} -R $1 -v -f - 2>&1 >> $LOGFILE + rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v -f - 2>&1 >> $LOGFILE done exit $? fi if [ ! -z "$DIRS" ]; then - ${RESTORECON} ${OUTFILES} -R $1 -v $DIRS 2>&1 >> $LOGFILE + ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE exit $? fi LogReadOnly -${SETFILES} ${OUTFILES} ${SYSLOGFLAG} $1 -v ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE +${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $1 -v ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE exit $? } @@ -165,9 +166,9 @@ # See how we were called. while getopts "C:Fo:R:l:" i; do case "$i" in - F) - fullFlag=1 - ;; + f) + fullFlag=1 + ;; R) RPMFILES=$OPTARG ;; @@ -180,6 +181,9 @@ C) PREFC=$OPTARG ;; + F) + FORCEFLAG="-F" + ;; *) usage exit 1 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-1.23.6/scripts/fixfiles.8 --- nsapolicycoreutils/scripts/fixfiles.8 2005-03-15 08:44:43.000000000 -0500 +++ policycoreutils-1.23.6/scripts/fixfiles.8 2005-04-29 10:41:45.000000000 -0400 @@ -3,9 +3,9 @@ fixfiles \- fix file security contexts. .SH "SYNOPSIS" -.B fixfiles [ -R rpmpackagename[,rpmpackagename...] ] [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] [-o outputfile ] { check | restore | [-F] relabel }" +.B fixfiles [-F] [ -R rpmpackagename[,rpmpackagename...] ] [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] [-o outputfile ] { check | restore | [-F] relabel }" -.B fixfiles [-l logfile ] [-o outputfile ] { check | restore|[-F] relabel } [[dir/file] ... ] +.B fixfiles [-F] [-l logfile ] [-o outputfile ] { check | restore|[-f] relabel } [[dir/file] ... ] .SH "DESCRIPTION" This manual page describes the @@ -31,6 +31,10 @@ .TP .B -F +Force reset of context to match file_context for customizable files + +.TP +.B -f Don't prompt for removal of /tmp directory. .TP