From: Milan Broz <gmazyland@gmail.com>
Date: Thu, 30 Jul 2015 14:18:28 +0000 (+0200)
Subject: lsblk: Display mountpoint even for top-level device
X-Git-Tag: v2.27-rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c49ff158aa21a16b94cf19bc8527cfdd67963082;p=thirdparty%2Futil-linux.git

lsblk: Display mountpoint even for top-level device

If a filesystem is mounted on top-level block device
with existing partitions, the mountpoint is not displayed
in the lsblk output.

This situation can happen by a configuration mistake
and lsblk could be used to detect such a mistake.

This patch allows searching for a mountpoint for all displayed
devices, not only for leaf nodes.
(It should be pretty cheap operation, mtab is parsed only once.)

For example: lsblk /dev/loop1
NAME      MAJ:MIN RM  SIZE RO TYPE MOUNTPOINT
loop1       7:1    0  128M  0 loop /mnt/tst
└─loop1p1 259:0    0  127M  0 loop

Signed-off-by: Milan Broz <gmazyland@gmail.com>
---

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index cfd304a7e1..4cfeef890b 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -916,8 +916,7 @@ static void set_scols_data(struct blkdev_cxt *cxt, int col, int id, struct libsc
 			str = xstrdup(cxt->fstype);
 		break;
 	case COL_TARGET:
-		if (!(cxt->nholders + cxt->npartitions))
-			str = get_device_mountpoint(cxt);
+		str = get_device_mountpoint(cxt);
 		break;
 	case COL_LABEL:
 		probe_device(cxt);