Create an empty selinux config file (#1332147)

In order for selinux to properly label the system it needs to see that
the config file exists.

Also remove the old code trying to copy in a selinux config file, it
never worked -- the removepkg would remove it.

(cherry picked from commit d6584e1d77)

Resolves: rhbz#1332147
This commit is contained in:
Brian C. Lane 2015-07-16 17:03:03 -07:00
parent 4ec05dd1c9
commit 73b368de28
2 changed files with 5 additions and 3 deletions

View File

@ -25,6 +25,11 @@ removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh \
/usr/lib/dracut/dracut-initramfs-restore
## we don't run SELinux (not in enforcing, anyway)
removepkg checkpolicy selinux-policy libselinux-utils
## selinux checks for the /etc/selinux/config file's existance
## The removepkg above removes it, create an empty one. See rhbz#1243168
append etc/selinux/config ""
## anaconda has its own repo files
removefrom fedora-release --allbut /etc/os-release
removepkg fedora-release-rawhide

View File

@ -63,9 +63,6 @@ mkdir etc/NetworkManager/conf.d
install ${configdir}/90-anaconda-no-auto-default.conf etc/NetworkManager/conf.d
install ${configdir}/91-anaconda-autoconnect-slaves.conf etc/NetworkManager/conf.d
install ${configdir}/92-anaconda-loglevel-debug.conf etc/NetworkManager/conf.d
%if exists(root+"/etc/selinux/targeted"):
install ${configdir}/selinux.config etc/selinux/config
%endif
install ${configdir}/vconsole.conf etc
## set up sshd