summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-12-19 15:11:34 -0500
committerDave Jones <davej@redhat.com>2011-12-19 15:11:34 -0500
commit7729f4130173279cb683d4d8dee630e14cc7b32c (patch)
treee34646df65c740e32fa0a18e25e6aaa6f4f70f0f /config-generic
parentcd4b60e82147fbc1ff9dc5fb8f069af3c23a0a06 (diff)
downloadkernel-7729f4130173279cb683d4d8dee630e14cc7b32c.tar.gz
kernel-7729f4130173279cb683d4d8dee630e14cc7b32c.tar.xz
kernel-7729f4130173279cb683d4d8dee630e14cc7b32c.zip
Disable IMA. (Forces TPM on, which may be undesirable: See 733964, 746097)
Move TPM modules to modules-extra
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 0e9fc74b4..9326ba0ba 100644
--- a/config-generic
+++ b/config-generic
@@ -4492,7 +4492,7 @@ CONFIG_FCOE_FNIC=m
CONFIG_NOP_USB_XCEIV=m
-CONFIG_IMA=y
+# CONFIG_IMA is not set
CONFIG_IMA_MEASURE_PCR_IDX=10
CONFIG_IMA_AUDIT=y
CONFIG_IMA_LSM_RULES=y