Merge "Remove fixfiles from rpm-distro finalize"

This commit is contained in:
Jenkins 2014-07-09 08:51:27 +00:00 committed by Gerrit Code Review
commit f58e50ee64

View File

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