From 6a9a40b3c1ad559baa7cab2b817a105be59a3b7c Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 23 Sep 2004 16:40:36 +0000 Subject: [PATCH] change fixfiles to only use terminal for logging if specified --- policycoreutils-rhat.patch | 4 ++-- policycoreutils.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 94cf77c..beef9b9 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,5 +1,5 @@ --- policycoreutils-1.17.5/scripts/fixfiles.rhat 2004-08-30 11:46:47.000000000 -0400 -+++ policycoreutils-1.17.5/scripts/fixfiles 2004-09-21 15:20:00.328279768 -0400 ++++ policycoreutils-1.17.5/scripts/fixfiles 2004-09-23 12:37:51.805467493 -0400 @@ -36,6 +36,8 @@ FILESYSTEMSRO=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[23]| xfs | reiserfs ).*\(ro/{print $3}';` FILESYSTEMS="$FILESYSTEMSRW $FILESYSTEMSRO" @@ -131,7 +131,7 @@ +done + +if [ $logfileFlag = 0 ]; then -+ LOGFILE=`tty` ++ LOGFILE=`mktemp /var/tmp/fixfiles.log.XXXXXXXXXX` + if [ ! -w $LOGFILE ] ; then + rm -f $FCFILE + exit 1 diff --git a/policycoreutils.spec b/policycoreutils.spec index fca09a1..d1d38a6 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -1,7 +1,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.17.5 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -77,6 +77,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Thu Sep 23 2004 Dan Walsh 1.17.5-4 +- Change to only display to terminal if tty is specified + * Tue Sep 21 2004 Dan Walsh 1.17.5-3 - Only display to stdout if logfile not specified