Disable IMA. (Forces TPM on, which may be undesirable: See 733964, 746097)

Move TPM modules to modules-extra
2011-12-19 15:11:34 -05:00 · 2011-12-19 15:11:34 -05:00 · 7729f41301
commit 7729f41301
parent cd4b60e821
3 changed files with 9 additions and 1 deletions
--- a/2
+++ b/2
@ -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
--- a/kernel.spec
+++ b/kernel.spec
@ -2230,6 +2230,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Dec 19 2011 Dave Jones <davej@redhat.com>
+- Disable IMA. (Forces TPM on, which may be undesirable: See 733964, 746097)
+  Move TPM modules to modules-extra
+
 * Mon Dec 19 2011 Dave Jones <davej@redhat.com> - 3.2.0-0.rc6.git1.1
 - Linux 3.2-rc6-git1 (390f998509bf049019df0b078c0a6606e0d57fb4)

--- a/mod-extra.list
+++ b/mod-extra.list
@ -194,3 +194,7 @@ ma600-sir.ko
 mcp2120-sir.ko
 toim3232-sir.ko
 pps_core.ko
+tpm_atmel
+tpm_infineon
+tpm_nsc
+tpm_tis