hostapp-update-hooks: fix path for grub_extraenv in blacklist

The `grub_extraenv` file is actually either installed under `/grub` for MBR systems or `/EFI/BOOT` for EFI ones. Change-type: patch Signed-off-by: Alex Gonzalez <[email protected]>
balena-os · Dec 17, 2024 · 564c0cd · 564c0cd
1 parent 3033e1a
commit 564c0cd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/meta-balena-common/recipes-support/hostapp-update-hooks/hostapp-update-hooks.bb b/meta-balena-common/recipes-support/hostapp-update-hooks/hostapp-update-hooks.bb
@@ -31,13 +31,15 @@ HOSTAPP_HOOKS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'efi', '${SECUR
 HOSTAPP_HOOKS_DIRS = "75-supervisor-db 76-supervisor-db"
 HOSTAPP_HOOKS_DIRS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'efi', '${SECUREBOOT_HOOK_DIRS}', '', d)}"
 
+GRUB_INSTALL_DIR = "${@bb.utils.contains('MACHINE_FEATURES','efi','/EFI/BOOT','/grub',d)}"
+
 BALENA_BOOT_FINGERPRINT = "${BALENA_FINGERPRINT_FILENAME}.${BALENA_FINGERPRINT_EXT}"
 BALENA_BOOTFILES_BLACKLIST="\
 	/config.json \
 	/config.txt \
 	/splash/balena-logo.png \
 	/extra_uEnv.txt \
-	/grub_extraenv \
+	/${GRUB_INSTALL_DIR}/grub_extraenv \
 	/configfs.json \
 	/hw_intfc.conf \
 	/bootenv \