Skip to content

Commit c78f78f

Browse files
authored
More properly support FAT12 and FAT16 ESPs (#3268)
FAT12 and FAT16 are also valid filesystems for ESPs, therefore, try to support them
1 parent 083194f commit c78f78f

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

archinstall/lib/disk/device_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def format(
277277
case FilesystemType.Ext2 | FilesystemType.Ext3 | FilesystemType.Ext4:
278278
# Force create
279279
options.append('-F')
280-
case FilesystemType.Fat16 | FilesystemType.Fat32:
280+
case FilesystemType.Fat12 | FilesystemType.Fat16 | FilesystemType.Fat32:
281281
mkfs_type = 'fat'
282282
# Set FAT size
283283
options.extend(('-F', fs_type.value.removeprefix(mkfs_type)))

archinstall/lib/models/device_model.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,7 @@ class FilesystemType(Enum):
767767
Ext3 = 'ext3'
768768
Ext4 = 'ext4'
769769
F2fs = 'f2fs'
770+
Fat12 = 'fat12'
770771
Fat16 = 'fat16'
771772
Fat32 = 'fat32'
772773
Ntfs = 'ntfs'
@@ -952,7 +953,11 @@ def relative_mountpoint(self) -> Path:
952953
def is_efi(self) -> bool:
953954
return (
954955
any(set(self.flags) & set(self._efi_indicator_flags))
955-
and self.fs_type == FilesystemType.Fat32
956+
and (
957+
self.fs_type == FilesystemType.Fat12
958+
or self.fs_type == FilesystemType.Fat16
959+
or self.fs_type == FilesystemType.Fat32
960+
)
956961
and PartitionFlag.XBOOTLDR not in self.flags
957962
)
958963

0 commit comments

Comments
 (0)