openstack
/
diskimage-builder
Code Issues Proposed changes

Remove fixfiles from rpm-distro finalize 

Running fixfiles after setfiles is redundant. setfiles
already corrected the SELinux file security contexts.

Change-Id: I48067f06968c5add48fa91a1496b9bf36944546c
Closes-Bug: #1316241
This commit is contained in:
Richard Su 2014-06-29 18:45:08 -07:00 committed by Ian Wienand
parent 61c192ea3c
commit 4e68a7965b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/rpm-distro/finalise.d/11-selinux-fixfiles-restore
View File

@ -10,10 +10,6 @@ if [ "$CONFIGURED_SELINUX" == "enforcing" ]; then
# instead of the sshd_t domain, making ssh connections fail with
# "Unable to get valid context for <user>" error message
setfiles /etc/selinux/targeted/contexts/files/file_contexts /
FIXFILES_LOG=$(mktemp)
fixfiles -l $FIXFILES_LOG restore
cat $FIXFILES_LOG
rm $FIXFILES_LOG
else
echo "Skipping SELinux relabel, since it is not Enforcing."
echo "To relabel once the image is running, use:"