diff options
| author | Karel Zak | 2010-12-17 01:28:59 +0100 |
|---|---|---|
| committer | Karel Zak | 2010-12-17 01:28:59 +0100 |
| commit | 6bec87105cb4f2e5baf9cde14174bee8376e3b32 (patch) | |
| tree | f40751962fab339e540c13bbce243171af1d7434 /fdisk/fdisk.c | |
| parent | swpaon: use canonicalized devnames on -s output (diff) | |
| download | kernel-qcow2-util-linux-6bec87105cb4f2e5baf9cde14174bee8376e3b32.tar.gz kernel-qcow2-util-linux-6bec87105cb4f2e5baf9cde14174bee8376e3b32.tar.xz kernel-qcow2-util-linux-6bec87105cb4f2e5baf9cde14174bee8376e3b32.zip | |
fdisk: use canonicalized names for -l (and sfdisk -d)
.. no more /dev/dm-X in "fdisk -l" and "sfdisk -d" output, always use
/dev/mapper/<name>.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisk/fdisk.c')
| -rw-r--r-- | fdisk/fdisk.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c index 1f841d17d..5a6943739 100644 --- a/fdisk/fdisk.c +++ b/fdisk/fdisk.c @@ -28,6 +28,8 @@ #include "mbsalign.h" #include "fdisk.h" #include "wholedisk.h" +#include "pathnames.h" +#include "canonicalize.h" #include "fdisksunlabel.h" #include "fdisksgilabel.h" @@ -2896,9 +2898,9 @@ tryprocpt(void) { int ma, mi; unsigned long long sz; - procpt = fopen(PROC_PARTITIONS, "r"); + procpt = fopen(_PATH_PROC_PARTITIONS, "r"); if (procpt == NULL) { - fprintf(stderr, _("cannot open %s\n"), PROC_PARTITIONS); + fprintf(stderr, _("cannot open %s\n"), _PATH_PROC_PARTITIONS); return; } @@ -2907,8 +2909,13 @@ tryprocpt(void) { &ma, &mi, &sz, ptname) != 4) continue; snprintf(devname, sizeof(devname), "/dev/%s", ptname); - if (is_whole_disk(devname)) - try(devname, 0); + if (is_whole_disk(devname)) { + char *cn = canonicalize_path(devname); + if (cn) { + try(cn, 0); + free(cn); + } + } } fclose(procpt); } |