From: Karel Zak <kzak@redhat.com>
Date: Wed, 24 Oct 2012 21:59:04 +0000 (+0200)
Subject: mount: supports paths canonicalization for alternative fstabs
X-Git-Tag: v2.23-rc1~574
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59414c6b4af56232e5ac218e69a0bbb3f5ba1952;p=thirdparty%2Futil-linux.git

mount: supports paths canonicalization for alternative fstabs

 # mount --fstab /path/my.fstab

has to support standard operations with paths.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index a6d046ba61..ed7417788d 100644
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -898,6 +898,16 @@ int main(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
+	if (fstab && !mnt_context_is_nocanonicalize(cxt)) {
+		/*
+		 * We have external (context independent) fstab instance, let's
+		 * make a connection between the fstab and the canonicalization
+		 * cache.
+		 */
+		struct libmnt_cache *cache = mnt_context_get_cache(cxt);
+		mnt_table_set_cache(fstab, cache);
+	}
+
 	if (!mnt_context_get_source(cxt) &&
 	    !mnt_context_get_target(cxt) &&
 	    !argc &&