openstack/diskimage-builder
Code Issues Proposed changes

Dont fail if were missing setfiles

Browse Source 
We are using which to find the location of setfiles. Our script is set
-e though, and we need to also be able to handle the case where setfiles
does not exist (like on centos-minimal).

Change-Id: If53c7a80efc081b95b143c28be64d39b12bfb469
This commit is contained in:
Gregory Haynes 2015-06-11 01:47:07 +00:00
parent c9f44b29bb
commit fe559242cb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
fi fi
set -eu set -eu
set -o pipefail set -o pipefail
SETFILES=$(which setfiles) SETFILES=$(which setfiles || true)
if [ -e /etc/selinux/targeted/contexts/files/file_contexts -a -x "${SETFILES}" ]; then if [ -e /etc/selinux/targeted/contexts/files/file_contexts -a -x "${SETFILES}" ]; then
# Without fixing selinux file labels, sshd will run in the kernel_t domain # Without fixing selinux file labels, sshd will run in the kernel_t domain
# instead of the sshd_t domain, making ssh connections fail with # instead of the sshd_t domain, making ssh connections fail with