diff mbox

[4/6] UBUNTU: [Config] Sync LSM config options

Message ID 1403911369-32675-5-git-send-email-tyhicks@canonical.com
State New
Headers show

Commit Message

Tyler Hicks June 27, 2014, 11:22 p.m. UTC 
Sync with the traditional Ubuntu kernel config options in regards to LSM
options.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
---
 debian.mako/config/config.common.ubuntu | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/debian.mako/config/config.common.ubuntu b/debian.mako/config/config.common.ubuntu
index 37e8053..1649259 100644
--- a/debian.mako/config/config.common.ubuntu
+++ b/debian.mako/config/config.common.ubuntu
@@ -2190,10 +2190,11 @@  CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_PATH=y
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
-# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_SECURITY_SELINUX_DEVELOP=y
-# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DISABLE=y
 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
 CONFIG_SECURITY_SMACK=y
 CONFIG_SECURITY_TOMOYO=y