Merge lp:~pr0gg3d/ubuntu/oneiric/util-linux/bug-805886 into lp:ubuntu/oneiric/util-linux

[Francesco Del Degan]

This fixes the problem stated in

https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/805886

and

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634107

as i explained in debian BTS.

=== modified file 'mount/fstab.c'
--- mount/fstab.c	2011-06-20 22:31:50 +0000
+++ mount/fstab.c	2011-08-07 18:13:28 +0000
@@ -344,9 +344,11 @@
 			return mc;
 	}
 
-	/* non-canonical names in mtab (this is BAD THING!) */
+	/* non-canonical names in mtab (this is BAD THING!) 
+	 * but it should be allowed only for spec fsname(s) 
+	 */
 	for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev) {
-		char *cn = canonicalize(mc->m.mnt_fsname);
+		char *cn = canonicalize_spec(mc->m.mnt_fsname);
 		int res = cn ? streq(cn, name) : 0;
 
 		free(cn);