Merge branch 'master' into ozonet

[openwrt/.git] / config / Config-kernel.in

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 4eaaa4afaedbf4e3be9e289e85bc0eb2dde6e435..1f677fd1f5ed21c0e93fdf02e4e4fe8d1a39b860 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -1133,18 +1133,10 @@ config KERNEL_SECURITY_SELINUX_DEVELOP
        bool "NSA SELinux Development Support"
        depends on KERNEL_SECURITY_SELINUX
 
-choice
-       prompt "First legacy 'major LSM' to be initialized"
+config KERNEL_LSM
+       string
+       default "lockdown,yama,loadpin,safesetid,integrity,selinux"
        depends on KERNEL_SECURITY_SELINUX
-       default KERNEL_DEFAULT_SECURITY_SELINUX
-
-       config KERNEL_DEFAULT_SECURITY_SELINUX
-               bool "SELinux"
-
-       config KERNEL_DEFAULT_SECURITY_DAC
-               bool "Unix Discretionary Access Controls"
-
-endchoice
 
 config KERNEL_EXT4_FS_SECURITY
        bool "Ext4 Security Labels"