RHEL-8: fix hybrid boot by bringing back /boot/efi

PR#450 [1] reverted the separate `/boot` partition for x86_64 images,
since it was causing issues. However, it also removed the `/boot/efi`
partition. These images are supposed to support UEFI boot and are marked
as such. This is causing failures when booting these images with UEFI in
osbuild-composer CI.

Fix this regression by bringing back `/boot/efi`.

[1] #450

Signed-off-by: Tomáš Hozza <[email protected]>

pkg/distro/rhel8/partition_tables.go

@@ -270,6 +270,19 @@ func getEc2PartitionTables(osVersion string, isRHEL bool) distro.BasePartitionTa
 					Type:     disk.BIOSBootPartitionGUID,
 					UUID:     disk.BIOSBootPartitionUUID,
 				},
+				{
+					Size: 200 * common.MebiByte,
+					Type: disk.EFISystemPartitionGUID,
+					UUID: disk.EFISystemPartitionUUID,
+					Payload: &disk.Filesystem{
+						Type:         "vfat",
+						UUID:         disk.EFIFilesystemUUID,
+						Mountpoint:   "/boot/efi",
+						FSTabOptions: "defaults,uid=0,gid=0,umask=077,shortname=winnt",
+						FSTabFreq:    0,
+						FSTabPassNo:  2,
+					},
+				},
 				{
 					Size: 2 * common.GibiByte,
 					Type: disk.FilesystemDataGUID,