- Fix crond handling for mls

This commit is contained in:
Daniel J Walsh 2006-10-02 19:45:00 +00:00
parent 8fff699602
commit 42dd742837
2 changed files with 11 additions and 3 deletions

View File

@ -2,7 +2,7 @@
SHAREDIR := /usr/share/selinux SHAREDIR := /usr/share/selinux
AWK ?= gawk AWK ?= gawk
NAME ?= $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config) NAME ?= $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config))
MLSENABLED := $(shell cat /selinux/mls) MLSENABLED := $(shell cat /selinux/mls)
ifeq ($(MLSENABLED),) ifeq ($(MLSENABLED),)
@ -10,7 +10,12 @@ ifeq ($(MLSENABLED),)
endif endif
ifeq ($(MLSENABLED),1) ifeq ($(MLSENABLED),1)
MCSFLAG=-mcs MCSFLAG=-mcs
endif
ifeq ($(NAME), mls)
NAME = strict
MCSFLAG = -mls
endif endif
TYPE ?= $(NAME)${MCSFLAG} TYPE ?= $(NAME)${MCSFLAG}

View File

@ -17,7 +17,7 @@
Summary: SELinux policy configuration Summary: SELinux policy configuration
Name: selinux-policy Name: selinux-policy
Version: 2.3.17 Version: 2.3.17
Release: 1 Release: 2
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source: serefpolicy-%{version}.tgz Source: serefpolicy-%{version}.tgz
@ -349,6 +349,9 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
%endif %endif
%changelog %changelog
* Mon Oct 2 2006 Dan Walsh <dwalsh@redhat.com> 2.3.17-2
- Fix crond handling for mls
* Fri Sep 28 2006 Dan Walsh <dwalsh@redhat.com> 2.3.17-1 * Fri Sep 28 2006 Dan Walsh <dwalsh@redhat.com> 2.3.17-1
- Update to upstream - Update to upstream