summaryrefslogtreecommitdiffstats
path: root/sys-utils/mount.c
diff options
context:
space:
mode:
authorDave Reisner2012-01-17 02:17:55 +0100
committerKarel Zak2012-01-17 11:11:20 +0100
commitaa397ce5e8dfc8cd0bd7d8f0dff95370764fb3f6 (patch)
treea9e209b89e1801e3b84481ebc1f481d9444fcb05 /sys-utils/mount.c
parentfdisk: fix last sector dialog bug after an incorrect input with suffix (diff)
downloadkernel-qcow2-util-linux-aa397ce5e8dfc8cd0bd7d8f0dff95370764fb3f6.tar.gz
kernel-qcow2-util-linux-aa397ce5e8dfc8cd0bd7d8f0dff95370764fb3f6.tar.xz
kernel-qcow2-util-linux-aa397ce5e8dfc8cd0bd7d8f0dff95370764fb3f6.zip
mount: avoid canonicalizing pseudofs paths
This fixes a display bug in the new mount wherein a psuedofs existing in $PWD by name will be resolved and shown as a real mount point. $ cd /tmp; mkdir nfsd; mount | grep nfsd /tmp/nfsd on /proc/fs/nfsd type nfsd (rw,relatime) Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Diffstat (limited to 'sys-utils/mount.c')
-rw-r--r--sys-utils/mount.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index 81ccb411b..0964828f5 100644
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -146,13 +146,14 @@ static void print_all(struct libmnt_context *cxt, char *pattern, int show_label)
const char *type = mnt_fs_get_fstype(fs);
const char *src = mnt_fs_get_source(fs);
const char *optstr = mnt_fs_get_options(fs);
- char *xsrc;
+ char *xsrc = NULL;
if (type && pattern && !mnt_match_fstype(type, pattern))
continue;
- xsrc = mnt_pretty_path(src, cache);
- printf ("%s on %s", xsrc, mnt_fs_get_target(fs));
+ if (!mnt_fs_is_pseudofs(fs))
+ xsrc = mnt_pretty_path(src, cache);
+ printf ("%s on %s", xsrc ? xsrc : src, mnt_fs_get_target(fs));
if (type)
printf (" type %s", type);
if (optstr)