diff options
| author | Dave Jones <davej@redhat.com> | 2011-12-19 15:11:34 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-12-19 15:11:34 -0500 |
| commit | 7729f4130173279cb683d4d8dee630e14cc7b32c (patch) | |
| tree | e34646df65c740e32fa0a18e25e6aaa6f4f70f0f | |
| parent | cd4b60e82147fbc1ff9dc5fb8f069af3c23a0a06 (diff) | |
| download | kernel-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
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 4 | ||||
| -rw-r--r-- | mod-extra.list | 4 |
3 files changed, 9 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 diff --git a/kernel.spec b/kernel.spec index f04c0405e..3a241f50b 100644 --- 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) diff --git a/mod-extra.list b/mod-extra.list index 68d9dbfb7..9311d6453 100644 --- 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 |