lorax-composer: Install selinux-policy-targeted in images

This is required to ensure that SELinux is configured properly while building. It fixes the problem with building tar, and should be installed in the other image types for consistency. Resolves: rhbz#1645189
2018-11-27 13:56:00 -08:00 · 2018-11-27 13:56:00 -08:00 · 97b138c3d1
commit 97b138c3d1
parent 22061ed4ab
9 changed files with 9 additions and 5 deletions
--- a/share/composer/ami.ks
+++ b/share/composer/ami.ks
@ -42,7 +42,7 @@ sed -i 's/cloud-user/ec2-user/' /etc/cloud/cloud.cfg
 %packages
 kernel
 -dracut-config-rescue
-
+selinux-policy-targeted
 grub2

 chrony
--- a/share/composer/ext4-filesystem.ks
+++ b/share/composer/ext4-filesystem.ks
@ -34,5 +34,6 @@ touch /etc/machine-id
 %packages --nocore
 # Packages requires to support this output format go here
 policycoreutils
+selinux-policy-targeted

 # NOTE lorax-composer will add the blueprint packages below here, including the final %end
--- a/share/composer/live-iso.ks
+++ b/share/composer/live-iso.ks
@ -357,6 +357,7 @@ syslinux
 dracut-config-generic
 dracut-live
 system-logos
+selinux-policy-targeted

 # This package is needed to boot the iso on UEFI
 shim
--- a/share/composer/openstack.ks
+++ b/share/composer/openstack.ks
@ -36,6 +36,7 @@ touch /etc/machine-id
 %packages
 kernel
 -dracut-config-rescue
+selinux-policy-targeted
 grub2

 # Make sure virt guest agents are installed
--- a/share/composer/partitioned-disk.ks
+++ b/share/composer/partitioned-disk.ks
@ -33,7 +33,7 @@ touch /etc/machine-id
 %packages
 kernel
 -dracut-config-rescue
-
+selinux-policy-targeted
 grub2

 # NOTE lorax-composer will add the blueprint packages below here, including the final %end
--- a/share/composer/qcow2.ks
+++ b/share/composer/qcow2.ks
@ -33,6 +33,7 @@ touch /etc/machine-id
 %packages
 kernel
 -dracut-config-rescue
+selinux-policy-targeted
 grub2

 # Make sure virt guest agents are installed
--- a/share/composer/tar.ks
+++ b/share/composer/tar.ks
@ -34,6 +34,6 @@ touch /etc/machine-id
 %packages --nocore
 # Packages requires to support this output format go here
 policycoreutils
-
+selinux-policy-targeted

 # NOTE lorax-composer will add the blueprint packages below here, including the final %end
--- a/share/composer/vhd.ks
+++ b/share/composer/vhd.ks
@ -61,7 +61,7 @@ dracut -f -v --persistent-policy by-uuid
 %packages
 kernel
 -dracut-config-rescue
-
+selinux-policy-targeted
 grub2

 chrony
--- a/share/composer/vmdk.ks
+++ b/share/composer/vmdk.ks
@ -36,7 +36,7 @@ touch /etc/machine-id
 %packages
 kernel
 -dracut-config-rescue
-
+selinux-policy-targeted
 grub2

 chrony