From 6be071b6e0d43a2fded8a3fd773525fb1216aa91 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sat, 30 Oct 2021 16:16:43 +0200 Subject: Enhanced get_mount_info() to recursively get the information --- archinstall/lib/disk/helpers.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/disk/helpers.py b/archinstall/lib/disk/helpers.py index 2e84a657..0111d327 100644 --- a/archinstall/lib/disk/helpers.py +++ b/archinstall/lib/disk/helpers.py @@ -117,10 +117,13 @@ def harddrive(size=None, model=None, fuzzy=False): def get_mount_info(path :Union[pathlib.Path, str]) -> dict: - try: - output = SysCommand(f'/usr/bin/findmnt --json {path}').decode('UTF-8') - except SysCallError: - return {} + for traversal in list(map(str, [str(path)] + list(pathlib.Path(str(path)).parents))): + try: + output = SysCommand(f'/usr/bin/findmnt --json {traversal}').decode('UTF-8') + if output: + break + except SysCallError: + pass if not output: return {} @@ -132,6 +135,8 @@ def get_mount_info(path :Union[pathlib.Path, str]) -> dict: return output['filesystems'][0] + return {} + def get_partitions_in_use(mountpoint) -> list: from .partition import Partition -- cgit v1.2.3-70-g09d2