summaryrefslogtreecommitdiffstats
path: root/mount/devname.c
diff options
context:
space:
mode:
authorMiklos Szeredi2010-10-07 16:05:12 +0200
committerKarel Zak2010-10-07 16:31:29 +0200
commit1cf4c20b198c0c6566198fd00b983d9aaf8321bc (patch)
treed1b57e3cd038e54aabf2e54a216076e7a72a58cc /mount/devname.c
parenttests: update namei regression test (diff)
downloadkernel-qcow2-util-linux-1cf4c20b198c0c6566198fd00b983d9aaf8321bc.tar.gz
kernel-qcow2-util-linux-1cf4c20b198c0c6566198fd00b983d9aaf8321bc.tar.xz
kernel-qcow2-util-linux-1cf4c20b198c0c6566198fd00b983d9aaf8321bc.zip
mount: don't canonicalize "spec" with --no-canonicalize option
"Spec" was still canonicalized despite --no-canonicalize. This resulted in a hang during login with pam_encfs (Debian Bug#593336). Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'mount/devname.c')
-rw-r--r--mount/devname.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mount/devname.c b/mount/devname.c
index 585d259ff..05da092f9 100644
--- a/mount/devname.c
+++ b/mount/devname.c
@@ -8,7 +8,7 @@ spec_to_devname(const char *spec)
{
if (!spec)
return NULL;
- if (is_pseudo_fs(spec))
+ if (nocanonicalize || is_pseudo_fs(spec))
return xstrdup(spec);
return fsprobe_get_devname_by_spec(spec);
}