]> err.no Git - util-linux/commitdiff
mount: don't canonicalize "spec" with --no-canonicalize option
authorMiklos Szeredi <miklos@szeredi.hu>
Thu, 7 Oct 2010 14:05:12 +0000 (16:05 +0200)
committerLaMont Jones <lamont@debian.org>
Fri, 17 Dec 2010 21:53:25 +0000 (14:53 -0700)
"Spec" was still canonicalized despite --no-canonicalize.  This
resulted in a hang during login with pam_encfs (Debian Bug#593336).

Addresses-Debian-Bug: 593336
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: LaMont Jones <lamont@debian.org>
mount/devname.c

index 585d259ff782a81c15cfdaf9dbf50f880a2356e4..05da092f96a93d4ed18e6d55b9697524ab6e0de8 100644 (file)
@@ -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);
 }