From 72893c88a923d6201702702eeb885ed2fe8f1409 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov <pavel.zhukov@huawei.com> Date: Wed, 11 May 2022 13:57:10 +0200 Subject: [PATCH] oniro-linux.conf: Specify bootindex for qemu root devices Without bootindex option qemu doesn't respect boot order when booting with EFI and writes wrong boot order information into the ovmf image which breaks boot order permanently. Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com> --- meta-oniro-core/conf/distro/oniro-linux.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf index 950d88ff..d6e83d7d 100644 --- a/meta-oniro-core/conf/distro/oniro-linux.conf +++ b/meta-oniro-core/conf/distro/oniro-linux.conf @@ -91,6 +91,11 @@ EFI_PROVIDER = "grub-efi" MACHINE_FEATURES:qemux86-64 += "efi" MACHINE_FEATURES:qemux86 += "efi" +# Add bootindex to qemu boot device to prevent boot order from being changed in ovmf file +# and not break boot order with EFI. See qemuboot.bbclass for more information +QB_ROOTFS_EXTRA_OPT:qemux86-64 += ",bootindex=0" +QB_ROOTFS_EXTRA_OPT:qemux86 += ",bootindex=0" + # Install the grubenv file deployed by oniro-grub-bootconf package into the EFI partition. IMAGE_EFI_BOOT_FILES += "grubenv;EFI/BOOT/grubenv" -- GitLab