From 60c7ab3e91d58bba9eb0a3a5a5b112c4fe170c86 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" 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#1654795 --- share/composer/ext4-filesystem.ks | 2 ++ share/composer/live-iso.ks | 1 + share/composer/partitioned-disk.ks | 2 +- share/composer/qcow2.ks | 1 + share/composer/tar.ks | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/share/composer/ext4-filesystem.ks b/share/composer/ext4-filesystem.ks index 5c5be642..9dd460c4 100644 --- a/share/composer/ext4-filesystem.ks +++ b/share/composer/ext4-filesystem.ks @@ -27,5 +27,7 @@ rm /var/lib/systemd/random-seed %end %packages --nobase +# Packages requires to support this output format go here +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 2f769987..3890d8c8 100644 --- a/share/composer/live-iso.ks +++ b/share/composer/live-iso.ks @@ -347,6 +347,7 @@ kernel memtest86+ syslinux -dracut-config-rescue +selinux-policy-targeted # This package is needed to boot the iso on UEFI shim diff --git a/share/composer/partitioned-disk.ks b/share/composer/partitioned-disk.ks index 291e54a7..46922259 100644 --- a/share/composer/partitioned-disk.ks +++ b/share/composer/partitioned-disk.ks @@ -31,7 +31,7 @@ rm /var/lib/systemd/random-seed %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 02bc0b73..59353052 100644 --- a/share/composer/qcow2.ks +++ b/share/composer/qcow2.ks @@ -31,6 +31,7 @@ rm /var/lib/systemd/random-seed %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/tar.ks b/share/composer/tar.ks index 285b50a7..cb304fbc 100644 --- a/share/composer/tar.ks +++ b/share/composer/tar.ks @@ -29,6 +29,6 @@ rm /var/lib/systemd/random-seed # NOTE Do NOT add any other sections after %packages %packages # Packages requires to support this output format go here - +selinux-policy-targeted # NOTE lorax-composer will add the blueprint packages below here, including the final %end