From ecbdc3bafa4ce65eff6691f57bb82cc983cb8c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 4 Jul 2024 16:56:47 +0200 Subject: [PATCH] Populate grubenv with RAUC data in clean aarch64 OS image While not as bad as in 87a6c84, because the grubenv already exists in the image, RAUC still complains about missing ORDER on the very first boot on aarch64. Populate the environment in the same way as we do for other GRUB platforms. --- .../board/arm-uefi/generic-aarch64/hassos-hook.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildroot-external/board/arm-uefi/generic-aarch64/hassos-hook.sh b/buildroot-external/board/arm-uefi/generic-aarch64/hassos-hook.sh index b67b6322bff..6f0504d4bd9 100755 --- a/buildroot-external/board/arm-uefi/generic-aarch64/hassos-hook.sh +++ b/buildroot-external/board/arm-uefi/generic-aarch64/hassos-hook.sh @@ -10,6 +10,9 @@ function hassos_pre_image() { cp "${BOARD_DIR}/grub.cfg" "${EFIPART_DATA}/EFI/BOOT/grub.cfg" cp "${BOARD_DIR}/cmdline.txt" "${EFIPART_DATA}/cmdline.txt" grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" create + grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set ORDER="A B" + grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set A_OK=1 + grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set A_TRY=0 cp -r "${EFIPART_DATA}/"* "${BOOT_DATA}/" } @@ -24,4 +27,3 @@ function hassos_post_image() { convert_disk_image_xz } -