diff options
Diffstat (limited to 'libfdisk')
| -rw-r--r-- | libfdisk/src/utils.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libfdisk/src/utils.c b/libfdisk/src/utils.c index 5ba9e0466..54e28b2fa 100644 --- a/libfdisk/src/utils.c +++ b/libfdisk/src/utils.c @@ -153,7 +153,20 @@ char *fdisk_partname(const char *dev, size_t partno) 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, "/dev/mapper", sizeof("/dev/mapper") - 1) == 0) { - p = "-part"; + asprintf(&res, "%.*s%zu", w, dev, partno); + if (access(res, F_OK) == 0){ + p = ""; + } else { + /* check for partition seperator "p" */ + p = "p"; + free(res); + asprintf(&res, "%.*s%s%zu", w, dev, p, partno); + if (access(res, F_OK) != 0){ + /* otherwise, default to "-path" */ + p = "-part"; + } + } + free(res); } if (asprintf(&res, "%.*s%s%zu", w, dev, p, partno) <= 0) |