From: Karel Zak <kzak@redhat.com>
Date: Mon, 25 Jul 2011 13:36:44 +0000 (+0200)
Subject: libmount: improve apply_fstab debugging
X-Git-Tag: v2.20-rc1~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9267c0991d98eb4b09d76d9334e9608a99662781;p=thirdparty%2Futil-linux.git

libmount: improve apply_fstab debugging

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

diff --git a/libmount/src/context.c b/libmount/src/context.c
index 70c7b33ad5..dc43707e95 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -1499,17 +1499,29 @@ int mnt_context_apply_fstab(struct libmnt_context *cxt)
 		return 0;
 
 	if (mnt_context_is_restricted(cxt)) {
-		DBG(CXT, mnt_debug_h(cxt, "force fstab usage for non-root users"));
+		DBG(CXT, mnt_debug_h(cxt, "force fstab usage for non-root users!"));
 		cxt->optsmode = MNT_OMODE_USER;
-
-	} else if (cxt->optsmode == 0)
+	} else if (cxt->optsmode == 0) {
+		DBG(CXT, mnt_debug_h(cxt, "use default optmode"));
 		cxt->optsmode = MNT_OMODE_AUTO;
 
+	}
+
 	if (cxt->fs) {
 		src = mnt_fs_get_source(cxt->fs);
 		tgt = mnt_fs_get_target(cxt->fs);
 	}
 
+	DBG(CXT, mnt_debug_h(cxt, "OPTSMODE: ignore=%d, append=%d, prepend=%d, "
+				  "replace=%d, force=%d, fstab=%d, mtab=%d",
+				  cxt->optsmode & MNT_OMODE_IGNORE ? 1 : 0,
+				  cxt->optsmode & MNT_OMODE_APPEND ? 1 : 0,
+				  cxt->optsmode & MNT_OMODE_PREPEND ? 1 : 0,
+				  cxt->optsmode & MNT_OMODE_REPLACE ? 1 : 0,
+				  cxt->optsmode & MNT_OMODE_FORCE ? 1 : 0,
+				  cxt->optsmode & MNT_OMODE_FSTAB ? 1 : 0,
+				  cxt->optsmode & MNT_OMODE_MTAB ? 1 : 0));
+
 	/* fstab is not required if source and target are specified */
 	if (src && tgt && !(cxt->optsmode & MNT_OMODE_FORCE)) {
 		DBG(CXT, mnt_debug_h(cxt, "fstab not required -- skip"));
@@ -1530,7 +1542,8 @@ int mnt_context_apply_fstab(struct libmnt_context *cxt)
 	}
 
 	/* try mtab */
-	if (rc == -1 && (cxt->optsmode & MNT_OMODE_MTAB)) {
+	if (rc < 0 && (cxt->optsmode & MNT_OMODE_MTAB)) {
+		DBG(CXT, mnt_debug_h(cxt, "tring to apply from mtab"));
 		rc = mnt_context_get_mtab(cxt, &tab);
 		if (!rc)
 			rc = apply_table(cxt, tab, MNT_ITER_BACKWARD);