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

Added error handling for get_mount_info()

This commit is contained in:
Anton Hvornum 2021-02-07 18:50:30 +01:00
parent 9db589f10a
commit 9038fda991
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
archinstall/lib/disk.py
View File

@ -127,15 +127,17 @@ class Partition():
if mountpoint: if mountpoint:
self.mount(mountpoint) self.mount(mountpoint)
partition_info = get_partition_info(self.path) mount_information = get_mount_info(self.path)
if self.mountpoint != partition_info['target'] and mountpoint: if self.mountpoint != mount_information['target'] and mountpoint:
raise DiskError(f"{self} was given a mountpoint but the actual mountpoint differs: {partition_info['target']}") raise DiskError(f"{self} was given a mountpoint but the actual mountpoint differs: {mount_information['target']}")
if partition_info['fstype'] != self.filesystem and filesystem: if mount_information['fstype'] != self.filesystem and filesystem:
raise DiskError(f"{self} was given a filesystem format, but a existing format was detected: {partition_info['fstype']}") raise DiskError(f"{self} was given a filesystem format, but a existing format was detected: {mount_information['fstype']}")
self.mountpoint = partition_info['target'] if (target := mount_information.get('target', None)):
self.filesystem = partition_info['fstype'] self.mountpoint = target
if (fstype := mount_information.get('fstype', None)):
self.filesystem = fstype
def __repr__(self, *args, **kwargs): def __repr__(self, *args, **kwargs):
if self.encrypted: if self.encrypted:
@ -344,8 +346,12 @@ def harddrive(size=None, model=None, fuzzy=False):
return collection[drive] return collection[drive]
def get_partition_info(path): def get_mount_info(path):
try:
output = b''.join(sys_command(f'/usr/bin/findmnt --json {path}')) output = b''.join(sys_command(f'/usr/bin/findmnt --json {path}'))
except SysCallError:
return {}
output = output.decode('UTF-8') output = output.decode('UTF-8')
output = json.loads(output) output = json.loads(output)
if 'filesystems' in output: if 'filesystems' in output: