From 23e12f63fd9008a4530e6330d7c50dc88c51d706 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Wed, 10 Aug 2022 01:19:30 +0200
Subject: [PATCH] x-gpt-efi-disk.wks.in: Use the grub.cfg from deploy directory
The grub.cfg file is processed based on the machine configuration and
the final result is deployed in DEPLOY_DIR_IMAGE. Use that file as
opposed to letting wic finding it in the layer - and using the template
one.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
Signed-off-by: Luca Seritan <luca.seritan@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 7bdb8e9b..086202b4 100644
--- a/meta-oniro-core/wic/x-gpt-efi-disk.wks.in
+++ b/meta-oniro-core/wic/x-gpt-efi-disk.wks.in
@@ -23,7 +23,7 @@
#
# We don't want to have a duplicate file but there's no support for relative
# paths so use a symbolic link instead.
-bootloader --configfile=grub.cfg --ptable gpt --timeout=${WIC_BOOTLOADER_TIMEOUT} --append=" rootfstype=${ROOT_FSTYPE} "
+bootloader --configfile="${DEPLOY_DIR_IMAGE}/grub.cfg" --ptable gpt --timeout=${WIC_BOOTLOADER_TIMEOUT} --append=" rootfstype=${ROOT_FSTYPE} "
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}
--
GitLab