From f2750c8d21c23a6b0ace41d1c0e2af1e84420510 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Wed, 9 Feb 2022 11:47:46 +0100
Subject: [PATCH] Improved logging, and made MapperDev() representable

---
 archinstall/lib/disk/mapperdev.py | 3 +++
 archinstall/lib/luks.py           | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/archinstall/lib/disk/mapperdev.py b/archinstall/lib/disk/mapperdev.py
index 43248c73..52438e86 100644
--- a/archinstall/lib/disk/mapperdev.py
+++ b/archinstall/lib/disk/mapperdev.py
@@ -16,6 +16,9 @@ if TYPE_CHECKING:
 class MapperDev:
 	mappername :str
 
+	def __repr__(self) -> str:
+		return self.path
+
 	@property
 	def name(self):
 		return self.mappername
diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py
index 52715b13..d423f662 100644
--- a/archinstall/lib/luks.py
+++ b/archinstall/lib/luks.py
@@ -102,8 +102,8 @@ class luks2:
 			'luksFormat', partition.path,
 		])
 
+		print(f"Looking for phrase: 'Enter passphrase for {partition.path}'")
 		cryptworker = SysCommandWorker(cryptsetup_args, peak_output=True)
-		print(f" Looking for phrase: 'Enter passphrase for {partition.path}'")
 
 		pw_given = False
 		while cryptworker.is_alive():
@@ -193,9 +193,11 @@ class luks2:
 			raise DiskError(f"Could not unlock {partition}: {cryptworker}")
 
 		if os.path.islink(f'/dev/mapper/{mountpoint}'):
-			self.mapdev = f'/dev/mapper/{mountpoint}'
+			self.mapdev = MapperDev(mountpoint)
 
-			return MapperDev(mountpoint)
+			log(f"{partition} unlocked as {self.mapdev}")
+
+			return self.mapdev
 
 	def close(self, mountpoint :Optional[str] = None) -> bool:
 		if not mountpoint: