This should fix #151, by using lsblk instead of /dev/disk/by-partuuid. It also cleaned up the installer code quite a bit during the bootloader installation. Will do the same for encrypted drives later on by implementing UUID on a BlockDevice (disk) level.

1 files changed, 11 insertions, 0 deletions

diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index 44d46c8b..8fbc50b2 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -191,6 +191,17 @@ class Partition():
 			return f'Partition(path={self.path}, fs={self.filesystem}{mount_repr})'
 
 	@property
+	def uuid(self) -> str:
+		"""
+		Returns the PARTUUID as returned by lsblk.
+		This is more reliable than relying on /dev/disk/by-partuuid as
+		it doesn't seam to be able to detect md raid partitions.
+		"""
+		lsblk = b''.join(sys_command(f'lsblk -J {self.path}'))
+		for partition in json.loads(lsblk.decode('UTF-8'))['blockdevices']:
+			return partition['partuuid']
+
+	@property
 	def encrypted(self):
 		return self._encrypted