From ef794db4d1a98aeab7ca5f6d7dd726277fc460a9 Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Fri, 18 Oct 2019 12:30:21 +0100 Subject: [PATCH] Fix syntax error in selinux-fixfiles-restore Seeing this at the end of the tripleo overcloud full build: 99-selinux-fixfiles-restore: line 69: [: too many arguments Change-Id: I8fb10f3d3d38723b41190ae1898757e6df073945 --- .../elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore b/diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore index 00caefa3..0ef00b29 100755 --- a/diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore +++ b/diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore @@ -66,7 +66,7 @@ fi IFS='|' read -ra SPLIT_MOUNTS <<< "$DIB_MOUNTPOINTS" for MOUNTPOINT in "${SPLIT_MOUNTS[@]}"; do 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" exit 1 fi