From 8b5940be9665b65cf3fcf4b6f3776470cf59509c Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 25 May 2015 21:17:52 +0200 Subject: [PATCH] Use correct partition names for /dev/mapper The default configuration of multipath-tools appends "-partN" to partition nodes. Follow this conventions and do the same. It fixes for example fdisk -l /dev/mapper/name_of_the_device. Note that the current implementation only partially fixes the problem. It does not reflect any udev configuration changes, as udev does not provide any function to return names of future (or current) partitions of a particular device. It also does not fix fdisk -l /dev/dm-0. Signed-off-by: Stanislav Brabec --- libfdisk/src/utils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libfdisk/src/utils.c b/libfdisk/src/utils.c index cc470d99bb..4789dbd226 100644 --- a/libfdisk/src/utils.c +++ b/libfdisk/src/utils.c @@ -139,9 +139,11 @@ char *fdisk_partname(const char *dev, size_t partno) } /* udev names partitions by appending -partN - e.g. ata-SAMSUNG_SV8004H_0357J1FT712448-part1 */ + e.g. ata-SAMSUNG_SV8004H_0357J1FT712448-part1 + multipath-tools kpartx.rules also append -partN */ if ((strncmp(dev, _PATH_DEV_BYID, sizeof(_PATH_DEV_BYID) - 1) == 0) || - strncmp(dev, _PATH_DEV_BYPATH, sizeof(_PATH_DEV_BYPATH) - 1) == 0) { + strncmp(dev, _PATH_DEV_BYPATH, sizeof(_PATH_DEV_BYPATH) - 1) == 0 || + strncmp(dev, "/dev/mapper", sizeof("/dev/mapper") - 1) == 0) { p = "-part"; } -- 2.47.2