From afea92abb3c4d917dad3616e1dcc79c26f4f10e4 Mon Sep 17 00:00:00 2001 From: Lans Zhang Date: Fri, 28 Jul 2017 10:01:20 +0800 Subject: grub-efi: remove the depreciated replacement for initrd= parameter Signed-off-by: Lans Zhang --- meta-efi-secure-boot/recipes-bsp/grub/grub-efi_2.02.bbappend | 8 +------- 1 file changed, 1 insertion(+), 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() { # IMA rules. [ x"${IMA}" = x"1" -a x"${@bb.utils.contains('DISTRO_FEATURES', 'encrypted-storage', '1', '0', d)}" != x"1" ] && { ! grep -q "ima_policy=tcb" "$menu" && - sed -i 's/^\s*chainloader\s\+.*bzImage.*/& ima_policy=tcb/g' "$menu" - } - - [ x"${UEFI_SB}" = x"1" ] && { - # Don't allow to load the detached initramfs if the bundled kernel used. - [ x"${INITRAMFS_IMAGE_BUNDLE}" = x"1" ] && - sed -i 's/\(^\s*chainloader\s\+.*bzImage.*\)\s\+initrd=[^[:space:]]*\(.*\)/\1\2/g' "$menu" + sed -i 's/^\s*linux\s\+.*bzImage.*/& ima_policy=tcb/g' "$menu" } # Install the stacked grub configs. -- cgit v1.2.3-54-g00ecf