From bf4c32e2e00a66ca704021295f7b2c4afe0949da Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sat, 3 Apr 2021 18:34:51 +0200 Subject: Forgot option PARTUUID to lsblk --- archinstall/lib/disk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index 8fbc50b2..10d4ef5a 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -197,9 +197,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): -- cgit v1.2.3-54-g00ecf From ef021698b698037388771600e4815b8e9152872d Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sat, 3 Apr 2021 19:38:44 +0200 Subject: Updated CODEOWNERS Mainly to avoid pinging grazzolini on every PR for code review. But left him on the PKGBUILDs as he has way better knowledge about those things. --- .github/CODEOWNERS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3-54-g00ecf