Merging in latest changes from master.
This commit is contained in:
commit
d66e3f2956
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
Loading…
Reference in New Issue