From 437ac124c6f02bc4f1c7e319a8ad407acffe9d8f Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Tue, 9 Aug 2022 20:05:05 +0200 Subject: Converted paths to pathlib.Path and mount points to detect properly (#1412) * Converted a path to pathlib.Path * Using Partition.mountpoints instead of Partition.mountpoint * Update mapperdev.py * Added .mountpoints to MapperDev * Spelling error --- archinstall/lib/disk/mapperdev.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'archinstall/lib/disk/mapperdev.py') diff --git a/archinstall/lib/disk/mapperdev.py b/archinstall/lib/disk/mapperdev.py index 49137ae9..71ef2a79 100644 --- a/archinstall/lib/disk/mapperdev.py +++ b/archinstall/lib/disk/mapperdev.py @@ -64,10 +64,14 @@ class MapperDev: return None + @property + def mountpoints(self) -> List[Dict[str, Any]]: + return [obj['target'] for obj in self.mount_information] + @property def mount_information(self) -> List[Dict[str, Any]]: from .helpers import find_mountpoint - return list(find_mountpoint(self.path)) + return [{**obj, 'target' : pathlib.Path(obj.get('target', '/dev/null'))} for obj in find_mountpoint(self.path)] @property def filesystem(self) -> Optional[str]: -- cgit v1.2.3-54-g00ecf