From ebb3cdf4657720d2a5228c27d8287b347704255b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sun, 8 Dec 2024 13:15:35 +0100
Subject: [PATCH] template: create filesystem on EFI partition

Bootloader isn't installed there yet, but having the filesystem allows
systemd to mount it (it really wants to, even if not booing in EFI
mode...) instead of failing.
And also, set 4k sector size to avoid compatibility issues.

QubesOS/qubes-issues#4974
---
 qubesbuilder/plugins/template/scripts/prepare-image | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qubesbuilder/plugins/template/scripts/prepare-image b/qubesbuilder/plugins/template/scripts/prepare-image
index 39bd816c..465503b3 100755
--- a/qubesbuilder/plugins/template/scripts/prepare-image
+++ b/qubesbuilder/plugins/template/scripts/prepare-image
@@ -90,6 +90,9 @@ EOF
 
         IMG_LOOP=$(/sbin/losetup -P -f --show "$IMG")
         IMG_DEV=${IMG_LOOP}p3
+
+        udevadm settle --exit-if-exists="${IMG_LOOP}p1"
+        /sbin/mkfs.vfat -S 4096 -n EFI "${IMG_LOOP}p1" || exit 1
     else
         IMG_LOOP=$(/sbin/losetup -f --show "$IMG")
         IMG_DEV=${IMG_LOOP}