| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/disk.py | 21 | ||||
| -rw-r--r-- | examples/guided.py | 3 |
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index 8eb4b54d..d2bac3d2 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -113,7 +113,6 @@ class BlockDevice(): return True return False - class Partition(): def __init__(self, path, part_id=None, size=-1, filesystem=None, mountpoint=None, encrypted=False): if not part_id: @@ -138,15 +137,6 @@ class Partition(): self.mountpoint = partition_info['target'] self.filesystem = partition_info['fstype'] - # We perform a dummy format on /dev/null with the given filesystem-type - # in order to determain if we support it or not. - try: - self.format(self.filesystem, '/dev/null') - except SysCallError: - pass # We supported it, but /dev/null is not formatable as expected so the mkfs call exited with an error code - except UnknownFilesystemFormat as err: - raise err - def __repr__(self, *args, **kwargs): if self.encrypted: return f'Partition(path={self.path}, real_device={self.real_device}, fs={self.filesystem}, mounted={self.mountpoint})' @@ -217,6 +207,17 @@ class Partition(): self.mountpoint = target return True + def filesystem_supported(self): + # We perform a dummy format on /dev/null with the given filesystem-type + # in order to determain if we support it or not. + try: + self.format(self.filesystem, '/dev/null') + except SysCallError: + pass # We supported it, but /dev/null is not formatable as expected so the mkfs call exited with an error code + except UnknownFilesystemFormat as err: + raise err + return True + class Filesystem(): # TODO: # When instance of a HDD is selected, check all usages and gracefully unmount them diff --git a/examples/guided.py b/examples/guided.py index 4f7da99f..384c4e17 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -104,7 +104,8 @@ if harddrive.has_partitions(): archinstall.log('Using existing partition table:') for partition in harddrive: - archinstall.log(f" {partition}") + if partition.filesystem_supported(): + archinstall.log(f" {partition}") else: print('Formatting woop woop!') exit(1) |