From 79784451d6ee32881823de4aa442cf7ee970fc67 Mon Sep 17 00:00:00 2001 From: Ossi Koivistoinen Date: Fri, 24 May 2019 01:21:52 +0300 Subject: [PATCH] Fix DIB in SELinux permissive hosts Remove the DIB element that tries to fix SELinux labels in the build host after the disk image has been built. The script fails for many reason when run inside container. We should not need it because running SELinux in permissive mode and the host that is being cleaned up is a container. Exporting LIBGUESTFS_BACKEND=direct is required to execute virt-copy-out in LF Jenkins slaves. Change-Id: Iaa3d01b17524a08ee5d2f14e591dcef0dabd3a89 Signed-off-by: Ossi Koivistoinen --- build_step_create_install_cd.sh | 3 ++- docker-context/Dockerfile-dib | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build_step_create_install_cd.sh b/build_step_create_install_cd.sh index 82a5cbf..ee3fee6 100755 --- a/build_step_create_install_cd.sh +++ b/build_step_create_install_cd.sh @@ -57,7 +57,7 @@ pushd $iso_build_dir # Get files needed for generating CD image. wget_dir ${cd_efi_dir}/ wget_dir ${cd_images_dir}/ -rm -rf images/boot.iso +rm -f images/boot.iso sync wget_dir ${cd_isolinux_dir}/ chmod +w -R isolinux/ EFI/ images/ @@ -79,6 +79,7 @@ popd pushd $tmp # Copy latest kernel and initrd-provisioning from boot dir +export LIBGUESTFS_BACKEND=direct virt-copy-out -a $input_image /boot/ ./ chmod u+w boot/ rm -f $iso_build_dir/isolinux/vmlinuz $iso_build_dir/isolinux/initrd.img diff --git a/docker-context/Dockerfile-dib b/docker-context/Dockerfile-dib index ffaa975..1a339f0 100644 --- a/docker-context/Dockerfile-dib +++ b/docker-context/Dockerfile-dib @@ -29,5 +29,6 @@ RUN \ sudo \ e2fsprogs \ xfsprogs +RUN find -name 99-selinux-fixfiles-restore -exec rm {} \; WORKDIR /work -- 2.16.6