summaryrefslogtreecommitdiffstats
path: root/misc-utils
diff options
context:
space:
mode:
authorMilan Broz2015-07-30 16:18:28 +0200
committerKarel Zak2015-07-31 10:44:57 +0200
commitc49ff158aa21a16b94cf19bc8527cfdd67963082 (patch)
treec37051e8e3ca804e3055b2963f6814400c4845c1 /misc-utils
parentsfdisk: don't print extra linebreaks on --quiet (diff)
downloadkernel-qcow2-util-linux-c49ff158aa21a16b94cf19bc8527cfdd67963082.tar.gz
kernel-qcow2-util-linux-c49ff158aa21a16b94cf19bc8527cfdd67963082.tar.xz
kernel-qcow2-util-linux-c49ff158aa21a16b94cf19bc8527cfdd67963082.zip
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>
Diffstat (limited to 'misc-utils')
-rw-r--r--misc-utils/lsblk.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index cfd304a7e..4cfeef890 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);