openstack/diskimage-builder
Code Issues Proposed changes

Merge "Fix syntax error in selinux-fixfiles-restore"

Browse Source
This commit is contained in:
Zuul 2019-10-24 22:30:27 +00:00 committed by Gerrit Code Review
commit fccb6ce32b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore
View File

@ -66,7 +66,7 @@ fi
IFS='|' read -ra SPLIT_MOUNTS <<< "$DIB_MOUNTPOINTS" IFS='|' read -ra SPLIT_MOUNTS <<< "$DIB_MOUNTPOINTS"
for MOUNTPOINT in "${SPLIT_MOUNTS[@]}"; do for MOUNTPOINT in "${SPLIT_MOUNTS[@]}"; do
if [ "${MOUNTPOINT}" != "/tmp/in_target.d" ] && [ "${MOUNTPOINT}" != "/dev" ] && [ "${MOUNTPOINT}" != "/boot/efi" ]; then if [ "${MOUNTPOINT}" != "/tmp/in_target.d" ] && [ "${MOUNTPOINT}" != "/dev" ] && [ "${MOUNTPOINT}" != "/boot/efi" ]; then
if ! [ -z ${_runcon} ] && ! pgrep kauditd >/dev/null; then if ! [ -z "${_runcon}" ] && ! pgrep kauditd >/dev/null; then
echo "*** SELinux enabled and kauditd not found, suggesting auditing support is disabled in the host kernel. setfiles will fail without this, please enable and rebuild" echo "*** SELinux enabled and kauditd not found, suggesting auditing support is disabled in the host kernel. setfiles will fail without this, please enable and rebuild"
exit 1 exit 1
fi fi