From: Karel Zak Date: Thu, 27 Jun 2019 07:22:18 +0000 (+0200) Subject: lsblk: force to print PKNAME for partition X-Git-Tag: v2.35-rc1~319 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Futil-linux.git;a=commitdiff_plain;h=e3bb9bfb76c17b1d05814436ced62c05c4011f48 lsblk: force to print PKNAME for partition PKNAME (parent kernel device name) is based on printed tree according to parent -> child relationship. The tree is optional and not printed if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old versions print the PKNAME also in this case. Addresses: https://github.com/karelzak/util-linux/issues/813 Signed-off-by: Karel Zak --- diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c index e95af7af02..3ce6da7302 100644 --- a/misc-utils/lsblk.c +++ b/misc-utils/lsblk.c @@ -1019,6 +1019,9 @@ static void device_to_scols( DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); + if (!parent && dev->wholedisk) + parent = dev->wholedisk; + /* Do not print device more than one in --list mode */ if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) return;