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.

2 files changed, 14 insertions, 11 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
 
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index d161c3b7..a4321893 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -384,18 +384,10 @@ class Installer():
 						break
 				else:
 					log(f"Identifying root partition by PART-UUID on {self.partition}, looking for '{os.path.basename(self.partition.path)}'.", level=LOG_LEVELS.Debug)
-					for root, folders, uids in os.walk('/dev/disk/by-partuuid'):
-						for uid in uids:
-							real_path = os.path.realpath(os.path.join(root, uid))
-
-							log(f"Checking root partition match {os.path.basename(real_path)} against {os.path.basename(self.partition.path)}: {os.path.basename(real_path) == os.path.basename(self.partition.path)}", level=LOG_LEVELS.Debug)
-							if not os.path.basename(real_path) == os.path.basename(self.partition.path): continue
-
-							entry.write(f'options root=PARTUUID={uid} rw intel_pstate=no_hwp\n')
+					entry.write(f'options root=PARTUUID={self.partition.uuid} rw intel_pstate=no_hwp\n')
 
-							self.helper_flags['bootloader'] = bootloader
-							return True
-						break
+					self.helper_flags['bootloader'] = bootloader
+					return True
 
 			raise RequirementError(f"Could not identify the UUID of {self.partition}, there for {self.mountpoint}/boot/loader/entries/arch.conf will be broken until fixed.")
 		else: