RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More properly support FAT12 and FAT16 ESPs (#3268) 

FAT12 and FAT16 are also valid filesystems for ESPs, therefore, try to support them
This commit is contained in:
mintsuki 2025-03-23 00:14:52 +01:00 committed by GitHub
parent 083194f0e8
commit c78f78fa9a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archinstall/lib/disk/device_handler.py
View File

@ -277,7 +277,7 @@ class DeviceHandler:
case FilesystemType.Ext2 | FilesystemType.Ext3 | FilesystemType.Ext4: case FilesystemType.Ext2 | FilesystemType.Ext3 | FilesystemType.Ext4:
# Force create # Force create
options.append('-F') options.append('-F')
case FilesystemType.Fat16 | FilesystemType.Fat32: case FilesystemType.Fat12 | FilesystemType.Fat16 | FilesystemType.Fat32:
mkfs_type = 'fat' mkfs_type = 'fat'
# Set FAT size # Set FAT size
options.extend(('-F', fs_type.value.removeprefix(mkfs_type))) options.extend(('-F', fs_type.value.removeprefix(mkfs_type)))

7
archinstall/lib/models/device_model.py
View File

@ -767,6 +767,7 @@ class FilesystemType(Enum):
Ext3 = 'ext3' Ext3 = 'ext3'
Ext4 = 'ext4' Ext4 = 'ext4'
F2fs = 'f2fs' F2fs = 'f2fs'
Fat12 = 'fat12'
Fat16 = 'fat16' Fat16 = 'fat16'
Fat32 = 'fat32' Fat32 = 'fat32'
Ntfs = 'ntfs' Ntfs = 'ntfs'
@ -952,7 +953,11 @@ class PartitionModification:
def is_efi(self) -> bool: def is_efi(self) -> bool:
return ( return (
any(set(self.flags) & set(self._efi_indicator_flags)) any(set(self.flags) & set(self._efi_indicator_flags))
and self.fs_type == FilesystemType.Fat32 and (
self.fs_type == FilesystemType.Fat12
or self.fs_type == FilesystemType.Fat16
or self.fs_type == FilesystemType.Fat32
)
and PartitionFlag.XBOOTLDR not in self.flags and PartitionFlag.XBOOTLDR not in self.flags
) )