From 6a8c6ddd6ad72407399a6801a50f34ac6be7ef8e Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei.gherzan@huawei.com> Date: Wed, 6 Oct 2021 16:14:08 +0100 Subject: [PATCH] x-efi-systemd-microcode.wks.in: Respect ROOT_FSTYPE Hardcoding the root filesystem type to ext4 can't work as the default rootfs type is squashfs. This patch fixes it by reusing the filesystem type from ROOT_FSTYPE. Fixes: https://git.ostc-eu.org/OSTC/OHOS/meta-ohos/-/issues/143 Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> --- meta-ohos-core/wic/x-efi-systemd-microcode.wks.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ohos-core/wic/x-efi-systemd-microcode.wks.in b/meta-ohos-core/wic/x-efi-systemd-microcode.wks.in index 9fbaa69c..89af7d87 100644 --- a/meta-ohos-core/wic/x-efi-systemd-microcode.wks.in +++ b/meta-ohos-core/wic/x-efi-systemd-microcode.wks.in @@ -16,7 +16,7 @@ # | | # 0 4096KiB -bootloader --ptable gpt --timeout=5 --append=" rootfstype=ext4 " +bootloader --ptable gpt --timeout=5 --append=" rootfstype=${ROOT_FSTYPE} " part --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=microcode.cpio" --label ${BOOT_PARTITION_LABEL} --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096 ${WIC_ROOTA_PARTITION} -- GitLab