forked from pool/util-linux
25 lines
746 B
Diff
25 lines
746 B
Diff
|
commit 1cf4c20b198c0c6566198fd00b983d9aaf8321bc
|
||
|
|
Author: Miklos Szeredi <miklos@szeredi.hu>
|
||
|
|
Date: Thu Oct 7 16:05:12 2010 +0200
|
||
|
|
|
||
|
|
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>
|
||
|
|
|
||
|
|
diff --git a/mount/devname.c b/mount/devname.c
|
||
|
|
index 585d259..05da092 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);
|
||
|
|
}
|