From 9ac4508135b74a3322be0ea9a896d7bf3c414ba9 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 27 Nov 2018 13:56:00 -0800
Subject: [PATCH] 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
---
 share/composer/ami.ks              | 2 +-
 share/composer/ext4-filesystem.ks  | 1 +
 share/composer/live-iso.ks         | 1 +
 share/composer/openstack.ks        | 1 +
 share/composer/partitioned-disk.ks | 2 +-
 share/composer/qcow2.ks            | 1 +
 share/composer/tar.ks              | 2 +-
 share/composer/vhd.ks              | 2 +-
 share/composer/vmdk.ks             | 2 +-
 9 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/share/composer/ami.ks b/share/composer/ami.ks
index c74069fb..7393c7f8 100644
--- 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
diff --git a/share/composer/ext4-filesystem.ks b/share/composer/ext4-filesystem.ks
index 698be0c7..e2616b30 100644
--- 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
diff --git a/share/composer/live-iso.ks b/share/composer/live-iso.ks
index cd2b711e..fada4f77 100644
--- a/share/composer/live-iso.ks
+++ b/share/composer/live-iso.ks
@@ -357,6 +357,7 @@ syslinux
 dracut-config-generic
 dracut-live
 generic-logos
+selinux-policy-targeted
 
 # This package is needed to boot the iso on UEFI
 shim
diff --git a/share/composer/openstack.ks b/share/composer/openstack.ks
index 7db64163..8823a16b 100644
--- 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
diff --git a/share/composer/partitioned-disk.ks b/share/composer/partitioned-disk.ks
index 21d0f720..468b25fa 100644
--- 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
diff --git a/share/composer/qcow2.ks b/share/composer/qcow2.ks
index 88e0a89d..824f6deb 100644
--- 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
diff --git a/share/composer/tar.ks b/share/composer/tar.ks
index 4816cc6e..be893f94 100644
--- 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
diff --git a/share/composer/vhd.ks b/share/composer/vhd.ks
index 812e0251..105012a8 100644
--- 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
diff --git a/share/composer/vmdk.ks b/share/composer/vmdk.ks
index b6f8ddac..63a3b3a9 100644
--- 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