Merging in latest changes from master.

2 files changed, 7 insertions, 3 deletions

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d499f478..4c93403a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3 +1,7 @@
 # As per https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#example-of-a-codeowners-file
 
-* @Torxed @grazzolini
+* @Torxed
+
+# Any PKGBUILD changes should tag grazzolini
+/PKGBUILDs/ @grazzolini
+/PKGBUILD @grazzolini
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index 31e8e007..4ea9f214 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -198,9 +198,9 @@ class Partition():
 		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}'))
+		lsblk = b''.join(sys_command(f'lsblk -J -o+PARTUUID {self.path}'))
 		for partition in json.loads(lsblk.decode('UTF-8'))['blockdevices']:
-			return partition['partuuid']
+			return partition.get('partuuid', None)
 
 	@property
 	def encrypted(self):