diff options
author | Jia Zhang <lans.zhang2008@gmail.com> | 2017-08-20 15:31:11 +0800 |
---|---|---|
committer | Jia Zhang <lans.zhang2008@gmail.com> | 2017-08-20 15:31:11 +0800 |
commit | b1e14f4e88be503f91db9c51c89a5a9f5e30de91 (patch) | |
tree | cfa6161eb622b85b5413db8bc99bcf6aef7828cc /meta-efi-secure-boot | |
parent | cbdefad44c474bd8a6c987442ccc0d6d11234c68 (diff) | |
download | meta-secure-core-b1e14f4e88be503f91db9c51c89a5a9f5e30de91.tar.gz |
encrypted-storage: use luks as the feature name for current implementation
encrypted-storage layer will include more security features about encrypted
storage so the term "encrypted-storage" won't be used to specify a dedicated
technology term such as "LUKS".
Signed-off-by: Jia Zhang <lans.zhang2008@gmail.com>
Diffstat (limited to 'meta-efi-secure-boot')
-rw-r--r-- | meta-efi-secure-boot/recipes-bsp/grub/grub-efi_2.02.bbappend | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-efi-secure-boot/recipes-bsp/grub/grub-efi_2.02.bbappend b/meta-efi-secure-boot/recipes-bsp/grub/grub-efi_2.02.bbappend index da02b5c..1700adc 100644 --- a/meta-efi-secure-boot/recipes-bsp/grub/grub-efi_2.02.bbappend +++ b/meta-efi-secure-boot/recipes-bsp/grub/grub-efi_2.02.bbappend | |||
@@ -65,11 +65,10 @@ do_install_append_class-native() { | |||
65 | do_install_append_class-target() { | 65 | do_install_append_class-target() { |
66 | local menu="${WORKDIR}/boot-menu.inc" | 66 | local menu="${WORKDIR}/boot-menu.inc" |
67 | 67 | ||
68 | # Enable the default IMA rules if IMA is enabled and encrypted-storage is | 68 | # Enable the default IMA rules if IMA is enabled and luks is disabled. |
69 | # disabled. This is because unseal operation will fail when any PCR is | 69 | # This is because unseal operation will fail when any PCR is extended |
70 | # extended due to updating the aggregate integrity value by the default | 70 | # due to updating the aggregate integrity value by the default IMA rules. |
71 | # IMA rules. | 71 | [ x"${IMA}" = x"1" -a x"${@bb.utils.contains('DISTRO_FEATURES', 'luks', '1', '0', d)}" != x"1" ] && { |
72 | [ x"${IMA}" = x"1" -a x"${@bb.utils.contains('DISTRO_FEATURES', 'encrypted-storage', '1', '0', d)}" != x"1" ] && { | ||
73 | ! grep -q "ima_policy=tcb" "$menu" && | 72 | ! grep -q "ima_policy=tcb" "$menu" && |
74 | sed -i 's/^\s*linux\s\+.*bzImage.*/& ima_policy=tcb/g' "$menu" | 73 | sed -i 's/^\s*linux\s\+.*bzImage.*/& ima_policy=tcb/g' "$menu" |
75 | } | 74 | } |