index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Anton Hvornum <anton@hvornum.se> | 2022-05-26 18:46:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-26 18:46:10 +0200 |
commit | c93482a8b943a593608d8bae7156e357ed0002d5 (patch) | |
tree | ba86096368c74ae48212ed4751d06e7883b229e6 /archinstall/lib/disk/mapperdev.py | |
parent | f1608e76647578c731e51a7c1303656519aa2e5e (diff) |
-rw-r--r-- | archinstall/lib/disk/mapperdev.py | 10 |
diff --git a/archinstall/lib/disk/mapperdev.py b/archinstall/lib/disk/mapperdev.py index 32e3ac9b..67230012 100644 --- a/archinstall/lib/disk/mapperdev.py +++ b/archinstall/lib/disk/mapperdev.py @@ -51,11 +51,11 @@ class MapperDev: raise ValueError(f"Could not convert {self.mappername} to a real dm-crypt device") @property - def mountpoint(self) -> Optional[str]: + def mountpoint(self) -> Optional[pathlib.Path]: try: data = json.loads(SysCommand(f"findmnt --json -R {self.path}").decode()) for filesystem in data['filesystems']: - return filesystem.get('target') + return pathlib.Path(filesystem.get('target')) except SysCallError as error: # Not mounted anywhere most likely @@ -76,8 +76,8 @@ class MapperDev: @property def subvolumes(self) -> Iterator['BtrfsSubvolume']: - from .btrfs import get_subvolumes_from_findmnt + from .btrfs import subvolume_info_from_path for mountpoint in self.mount_information: - for result in get_subvolumes_from_findmnt(mountpoint): - yield result
\ No newline at end of file + if subvolume := subvolume_info_from_path(mountpoint): + yield subvolume
\ No newline at end of file |