diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-08 18:52:52 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-08 18:52:52 +0100 |
| commit | 4bf0dc61209385c960734b9317dab6ea02294f1e (patch) | |
| tree | 7f98909ccf83625278696df453b1e592d85ad0a8 /kernel-x86_64.config | |
| parent | ca61c9dcd2f76c2e7bf85ef3aa1ba5b7937d0ad1 (diff) | |
| parent | 6c72c6753eb6e537e9379b574c3932cbca452054 (diff) | |
| download | kernel-4bf0dc61209385c960734b9317dab6ea02294f1e.tar.gz kernel-4bf0dc61209385c960734b9317dab6ea02294f1e.tar.xz kernel-4bf0dc61209385c960734b9317dab6ea02294f1e.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.1.0-0.rc0.git4.1.vanilla.knurd.1.fc31kernel-5.1.0-0.rc0.git4.1.vanilla.knurd.1.fc30kernel-5.1.0-0.rc0.git4.1.vanilla.knurd.1.fc29kernel-5.1.0-0.rc0.git4.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-x86_64.config')
| -rw-r--r-- | kernel-x86_64.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 19ee3ca57..36f14f9ea 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2864,6 +2864,7 @@ CONFIG_LP_CONSOLE=y CONFIG_LPC_SCH=m CONFIG_LSI_ET1011C_PHY=m CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor" CONFIG_LTC1660=m # CONFIG_LTC2471 is not set # CONFIG_LTC2485 is not set @@ -4741,6 +4742,7 @@ CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set +# CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y |