Create an empty selinux config file (#1243168)

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.
This commit is contained in:
Brian C. Lane 2015-07-16 17:03:03 -07:00
parent 9e910fadde
commit d6584e1d77
2 changed files with 5 additions and 3 deletions

View File

@ -26,6 +26,11 @@ removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh \
/usr/lib/dracut/dracut-initramfs-restore /usr/lib/dracut/dracut-initramfs-restore
## we don't run SELinux (not in enforcing, anyway) ## we don't run SELinux (not in enforcing, anyway)
removepkg checkpolicy selinux-policy libselinux-utils 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 ## anaconda has its own repo files
removefrom fedora-release --allbut /etc/os-release /usr/lib/os-release \ removefrom fedora-release --allbut /etc/os-release /usr/lib/os-release \
/usr/lib/os.release.d/* /usr/lib/os.release.d/*

View File

@ -61,9 +61,6 @@ install ${configdir}/sysctl.conf etc/sysctl.d/anaconda.conf
install ${configdir}/spice-vdagentd etc/sysconfig install ${configdir}/spice-vdagentd etc/sysconfig
mkdir etc/NetworkManager/conf.d mkdir etc/NetworkManager/conf.d
install ${configdir}/91-anaconda-autoconnect-slaves.conf etc/NetworkManager/conf.d install ${configdir}/91-anaconda-autoconnect-slaves.conf etc/NetworkManager/conf.d
%if exists(root+"/etc/selinux/targeted"):
install ${configdir}/selinux.config etc/selinux/config
%endif
## set up sshd ## set up sshd
install ${configdir}/sshd_config.anaconda etc/ssh install ${configdir}/sshd_config.anaconda etc/ssh