From: Karel Zak <kzak@redhat.com>
Date: Wed, 3 Oct 2018 12:39:57 +0000 (+0200)
Subject: lsblk: always use "part" as TYPE for partitions
X-Git-Tag: v2.33-rc2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef2ce68b1f65f22f86272dc60902f9202380acd9;p=thirdparty%2Futil-linux.git

lsblk: always use "part" as TYPE for partitions

The current code uses "part" or "disk" only if nothing else is
possible to recognize. It means for example partitions on loops (or
RAIDs, etc) are marked as "loop" rather than "part".

Addresses: https://github.com/karelzak/util-linux/issues/700
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index c15e522305..d63b65a3ad 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -413,6 +413,9 @@ static char *get_type(struct blkdev_cxt *cxt)
 {
 	char *res = NULL, *p;
 
+	if (cxt->partition)
+		return xstrdup("part");
+
 	if (is_dm(cxt->name)) {
 		char *dm_uuid = NULL;
 
@@ -453,7 +456,7 @@ static char *get_type(struct blkdev_cxt *cxt)
 		if (ul_path_read_s32(cxt->sysfs, &x, "device/type") == 0)
 			type = blkdev_scsi_type_to_name(x);
 		if (!type)
-			type = cxt->partition ? "part" : "disk";
+			type = "disk";
 		res = xstrdup(type);
 	}