From 8b8c7bbbbe1b6759763af67f9977dcf07b638c80 Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Mon, 17 Jan 2022 11:09:45 +0100 Subject: [PATCH] Fix FS label of the ESP in Fedora distro definition The QEMU assembler in Fedora distro definition for UEFI systems used longer than allowed label for the VFAT filesystem of the EFI System Partition. The maximum allowed label length is 11 characters. This worked before with dosfstools, but in 2018, they added a label validation [1]. This change got into the v4.2 release of dosfstools, released in Jan 2021. And subsequently since F34, this new version of dosfstools is present in Fedora repositories. [1] https://github.com/dosfstools/dosfstools/commit/ca549534762c794e5a4cdc36143d17635d196c6a Signed-off-by: Tomas Hozza --- internal/distro/fedora33/distro.go | 2 +- test/data/manifests/fedora_33-aarch64-ami-boot.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/distro/fedora33/distro.go b/internal/distro/fedora33/distro.go index e340c17f9..c9eaf66e5 100644 --- a/internal/distro/fedora33/distro.go +++ b/internal/distro/fedora33/distro.go @@ -591,7 +591,7 @@ func qemuAssembler(format string, filename string, uefi bool, imageOptions distr Filesystem: &osbuild.QEMUFilesystem{ Type: "vfat", UUID: "46BB-8120", - Label: "EFI System Partition", + Label: "EFI-SYSTEM", Mountpoint: "/boot/efi", }, }, diff --git a/test/data/manifests/fedora_33-aarch64-ami-boot.json b/test/data/manifests/fedora_33-aarch64-ami-boot.json index 0046d9b71..6e8ef4f9d 100644 --- a/test/data/manifests/fedora_33-aarch64-ami-boot.json +++ b/test/data/manifests/fedora_33-aarch64-ami-boot.json @@ -3924,7 +3924,7 @@ "filesystem": { "type": "vfat", "uuid": "46BB-8120", - "label": "EFI System Partition", + "label": "EFI-SYSTEM", "mountpoint": "/boot/efi" } },