From b03a2af5b2ffacf78b8d4981900d4d12eddb98bf Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 8 Nov 2021 08:22:11 +0100 Subject: [PATCH] recovery-initramfs-init: fix support to identify encrypted rootfs images Since we added support for compressing rootfs images, we need to manage SWU packages with a regular rootfs image and with compressed images. That support was missing in the identification process when the SWU packet was verified. This commit fixes the identification of compressed rootfs images. https://onedigi.atlassian.net/browse/CC8X-320 Signed-off-by: Arturo Buzarra --- .../recovery/recovery-initramfs/recovery-initramfs-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init b/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init index 7bd485637..740739c4a 100644 --- a/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init +++ b/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init @@ -409,7 +409,7 @@ check_swu_package() { grep "Found Image" "${SWUPDATE_OUTPUT}" | grep -qs "rootfs for handler" && ROOTFS_IMAGE_IN_PACKAGE="yes" else # For eMMC packages, check for a *.ext4 image, which is very likely intended for the rootfs partition - grep "Found Image" "${SWUPDATE_OUTPUT}" | grep -qs "\.ext4 in device" && ROOTFS_IMAGE_IN_PACKAGE="yes" + grep -E "Found( compressed){0,1} Image" "${SWUPDATE_OUTPUT}" | grep -Eqs "\.ext4(\.gz){0,1} in device" && ROOTFS_IMAGE_IN_PACKAGE="yes" fi # Check if the rootfs is meant to be encrypted