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

Renamed fat32 to vfat to work more seamlessly with findmnt and other tools that report fat32 as vfat

This commit is contained in:
Anton Hvornum 2021-02-07 15:27:12 +01:00
parent a88a41abfb
commit 15aa16c425
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/lib/disk.py
View File

@ -163,11 +163,11 @@ class Partition():
if b'UUID' not in o: if b'UUID' not in o:
raise DiskError(f'Could not format {self.path} with {filesystem} because: {o}') raise DiskError(f'Could not format {self.path} with {filesystem} because: {o}')
self.filesystem = 'btrfs' self.filesystem = 'btrfs'
elif filesystem == 'fat32': elif filesystem == 'vfat':
o = b''.join(sys_command(f'/usr/bin/mkfs.vfat -F32 {self.path}')) o = b''.join(sys_command(f'/usr/bin/mkfs.vfat -F32 {self.path}'))
if (b'mkfs.fat' not in o and b'mkfs.vfat' not in o) or b'command not found' in o: if (b'mkfs.fat' not in o and b'mkfs.vfat' not in o) or b'command not found' in o:
raise DiskError(f'Could not format {self.path} with {filesystem} because: {o}') raise DiskError(f'Could not format {self.path} with {filesystem} because: {o}')
self.filesystem = 'fat32' self.filesystem = 'vfat'
elif filesystem == 'ext4': elif filesystem == 'ext4':
if (handle := sys_command(f'/usr/bin/mkfs.ext4 -F {self.path}')).exit_code != 0: if (handle := sys_command(f'/usr/bin/mkfs.ext4 -F {self.path}')).exit_code != 0:
raise DiskError(f'Could not format {self.path} with {filesystem} because: {b"".join(handle)}') raise DiskError(f'Could not format {self.path} with {filesystem} because: {b"".join(handle)}')
@ -259,7 +259,7 @@ class Filesystem():
return self.raw_parted(string).exit_code return self.raw_parted(string).exit_code
def use_entire_disk(self, prep_mode=None): def use_entire_disk(self, prep_mode=None):
self.add_partition('primary', start='1MiB', end='513MiB', format='fat32') self.add_partition('primary', start='1MiB', end='513MiB', format='vfat')
self.set_name(0, 'EFI') self.set_name(0, 'EFI')
self.set(0, 'boot on') self.set(0, 'boot on')
self.set(0, 'esp on') # TODO: Redundant, as in GPT mode it's an alias for "boot on"? https://www.gnu.org/software/parted/manual/html_node/set.html self.set(0, 'esp on') # TODO: Redundant, as in GPT mode it's an alias for "boot on"? https://www.gnu.org/software/parted/manual/html_node/set.html

2
examples/guided.py
View File

@ -285,7 +285,7 @@ with archinstall.Filesystem(harddrive, archinstall.GPT) as fs:
if harddrive.partition[1].size == '512M': if harddrive.partition[1].size == '512M':
raise OSError('Trying to encrypt the boot partition for petes sake..') raise OSError('Trying to encrypt the boot partition for petes sake..')
harddrive.partition[0].format('fat32') harddrive.partition[0].format('vfat')
if disk_password: if disk_password:
# First encrypt and unlock, then format the desired partition inside the encrypted part. # First encrypt and unlock, then format the desired partition inside the encrypted part.