In the automotive use case, some images will have empty EFI components so we should support that. In https://github.com/coreos/bootupd/issues/994, we added a check that makes sure the EFI component has at least 2 entries, which thus fails. What we want instead if the following: - If there are no EFI component found, then we don't include EFI.json - If there are some EFI component found: - Check if shim is part of them: - If it is, then there must be another component (i.e. bootloader) included - If it's not, do nothing special - Check if grub is part of them: - If it is, then there must be shim as another component - If it's not, do nothing special