[kernel] r18202 - in dists/trunk/linux-2.6/debian: . config

[Bastian Blank]

Author: waldi
Date: Fri Oct 28 23:35:51 2011
New Revision: 18202

Log:
* debian/changelog: Update.
* debian/config/config:
  Disable SECURITY_SELINUX_BOOTPARAM and SECURITY_SELINUX_DISABLE.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Oct 28 23:08:52 2011	(r18201)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Oct 28 23:35:51 2011	(r18202)
@@ -19,6 +19,7 @@
   * Remove linux-tools-* binary package.
   * Drop external module packages stuff.
   * Set default security module to Unix Discretionary Access Controls.
+    - Remove unneeded selinux boot parameter.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 27 Sep 2011 06:02:56 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Oct 28 23:08:52 2011	(r18201)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Oct 28 23:35:51 2011	(r18202)
@@ -4464,9 +4464,8 @@
 ## file: security/selinux/Kconfig
 ##
 CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
-CONFIG_SECURITY_SELINUX_DISABLE=y
+# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1