summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLans Zhang <jia.zhang@windriver.com>2017-07-28 10:01:20 +0800
committerLans Zhang <jia.zhang@windriver.com>2017-07-28 10:01:20 +0800
commitafea92abb3c4d917dad3616e1dcc79c26f4f10e4 (patch)
tree6ad218049831b64f5dba4d017051aa7e302c7f05
parentafdac6c3caaf36207248e3cbb06c1c9317481b92 (diff)
downloadmeta-secure-core-afea92abb3c4d917dad3616e1dcc79c26f4f10e4.tar.gz
grub-efi: remove the depreciated replacement for initrd= parameter
Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
-rw-r--r--meta-efi-secure-boot/recipes-bsp/grub/grub-efi_2.02.bbappend8
1 files changed, 1 insertions, 7 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 6a86f96..5a56857 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
@@ -71,13 +71,7 @@ do_install_append_class-target() {
71 # IMA rules. 71 # IMA rules.
72 [ x"${IMA}" = x"1" -a x"${@bb.utils.contains('DISTRO_FEATURES', 'encrypted-storage', '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" && 73 ! grep -q "ima_policy=tcb" "$menu" &&
74 sed -i 's/^\s*chainloader\s\+.*bzImage.*/& ima_policy=tcb/g' "$menu" 74 sed -i 's/^\s*linux\s\+.*bzImage.*/& ima_policy=tcb/g' "$menu"
75 }
76
77 [ x"${UEFI_SB}" = x"1" ] && {
78 # Don't allow to load the detached initramfs if the bundled kernel used.
79 [ x"${INITRAMFS_IMAGE_BUNDLE}" = x"1" ] &&
80 sed -i 's/\(^\s*chainloader\s\+.*bzImage.*\)\s\+initrd=[^[:space:]]*\(.*\)/\1\2/g' "$menu"
81 } 75 }
82 76
83 # Install the stacked grub configs. 77 # Install the stacked grub configs.