rpms/policycoreutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

selinux-autorelabel: remove incorrect redirection to /dev/null

Browse Source 
This code is currently incorrect.  Currently redirecting `fixfiles` to
/dev/null will have very little effect.  Two messages will be suppressed,
but both the percentage progress indicator, and any errors from
the setfiles/restorecon binary will still be shown.

The fact that fixfiles redirected its log output to stdin (!) was purely
an implementation artefact.  It was used to write log messages even inside
shell functions whose output is captured e.g. `RESULT=$(shell_func)`.

When fixfiles is fixed to support output redirection normally, this code
would now behave incorrectly.  It would suppress all percentage progress
messages for this long-running process.

Signed-off-by: Alan Jenkins <alan.christopher.jenkins@gmail.com>
This commit is contained in:
Alan Jenkins 2017-01-23 12:10:06 +00:00 committed by Petr Lautrbach
parent 469f6b64e9
commit db14db8479
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
selinux-autorelabel
View File

@ -29,7 +29,7 @@ relabel_selinux() {
FORCE=`cat /.autorelabel` FORCE=`cat /.autorelabel`
[ -x "/usr/sbin/quotaoff" ] && /usr/sbin/quotaoff -aug [ -x "/usr/sbin/quotaoff" ] && /usr/sbin/quotaoff -aug
/sbin/fixfiles $FORCE restore > /dev/null 2>&1 /sbin/fixfiles $FORCE restore
fi fi
rm -f /.autorelabel rm -f /.autorelabel
/usr/lib/dracut/dracut-initramfs-restore /usr/lib/dracut/dracut-initramfs-restore