unify CONFIG_SECURITY_SECLVL

svn path=/dists/trunk/linux-2.6/; revision=7577
This commit is contained in:
maximilian attems 2006-10-05 15:03:41 +00:00
parent 6c10358931
commit 2c8f3803b5
5 changed files with 6 additions and 6 deletions

View File

@ -1965,7 +1965,6 @@ CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_CAPABILITIES=y
# CONFIG_SECURITY_ROOTPLUG is not set
# CONFIG_SECURITY_SECLVL is not set
#
# Cryptographic options

View File

@ -1919,7 +1919,6 @@ CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_CAPABILITIES=y
# CONFIG_SECURITY_ROOTPLUG is not set
# CONFIG_SECURITY_SECLVL is not set
# CONFIG_SECURITY_SELINUX is not set
#

View File

@ -1107,7 +1107,6 @@ CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_CAPABILITIES=y
CONFIG_SECURITY_SECLVL=m
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0

View File

@ -1109,7 +1109,6 @@ CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_CAPABILITIES=y
CONFIG_SECURITY_SECLVL=m
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0

8
debian/changelog vendored
View File

@ -1,4 +1,4 @@
linux-2.6 (2.6.18-3) UNRELEASED; urgency=low
linux-2.6 (2.6.18-3) unstable; urgency=low
[ Bastian Blank ]
* Fix home of patch apply script.
@ -11,7 +11,11 @@ linux-2.6 (2.6.18-3) UNRELEASED; urgency=low
* Activate CONFIG_NET_CLS_* globaly. (Closes: #389918)
* Make CONFIG_EFI_VARS modular on i386. (Closes: #381951)
* Activate CONFIG_SCSI_ARCMSR on amd64, powerpc, sparc too.
-- Frederik Schüler <fs@debian.org> Mon, 2 Oct 2006 15:17:27 +0200
[ maximilian attems ]
* [mipsel] Disable CONFIG_SECURITY_SECLVL on DECstations too.
-- maximilian attems <maks@sternwelten.at> Thu, 5 Oct 2006 17:03:10 +0200
linux-2.6 (2.6.18-2) unstable; urgency=low