From 5bca8bcacd3f64ee8c9be70a44a39cac18d06dbc Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Wed, 8 Jul 2020 17:29:28 +0200 Subject: [PATCH] image-info: support for peculiar partitions Add support for partitions that can 'blkid' can not handle, like the bios boot partition. For such partitions, 'blkid' will fail; in that case all additional information will just be 'None'. --- tools/image-info | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/image-info b/tools/image-info index 816769e08..7ff61025c 100755 --- a/tools/image-info +++ b/tools/image-info @@ -143,8 +143,13 @@ def read_image_format(device): def read_partition(device, partition): - blkid = subprocess_check_output(["blkid", "--output", "export", device], - parse_environment_vars) + res = subprocess.run(["blkid", "--output", "export", device], + check=False, encoding="utf-8", + stdout=subprocess.PIPE) + if res.returncode == 0: + blkid = parse_environment_vars(res.stdout) + else: + blkid = {} partition["label"] = blkid.get("LABEL") # doesn't exist for mbr partition["uuid"] = blkid.get("UUID")