From f8bae7e7c34bbc0ed9be041c50f331484ff4f600 Mon Sep 17 00:00:00 2001 From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com> Date: Tue, 22 Feb 2022 10:31:59 +0000 Subject: [PATCH] wic: remove duplicate --boot from x-gpt-efi-disk The x-gpt-efi-disk kickstart file has a duplicate --boot argument for the boot partition. One uses the BOOT_PARTITION_LABEL variable. The other uses a hard-coded string "boot". Drop the hard-coded value. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com> --- meta-oniro-core/wic/x-gpt-efi-disk.wks.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oniro-core/wic/x-gpt-efi-disk.wks.in b/meta-oniro-core/wic/x-gpt-efi-disk.wks.in index cf22f32b..72e017ae 100644 --- a/meta-oniro-core/wic/x-gpt-efi-disk.wks.in +++ b/meta-oniro-core/wic/x-gpt-efi-disk.wks.in @@ -17,7 +17,7 @@ bootloader --ptable gpt --timeout=${WIC_BOOTLOADER_TIMEOUT} --append=" rootfstype=${ROOT_FSTYPE} " -part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --label ${BOOT_PARTITION_LABEL} --label boot --active --align 4096 --offset 4096 --fixed-size ${BOOT_PARTITION_SIZE} +part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --label ${BOOT_PARTITION_LABEL} --active --align 4096 --offset 4096 --fixed-size ${BOOT_PARTITION_SIZE} ${WIC_ROOTA_PARTITION} ${WIC_ROOTB_PARTITION} ${WIC_DEVDATA_PARTITION} -- GitLab