libmount: add 'force-mountinfo' to features list, improve debug

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

diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index 873dd06bf6655e490a079439fa6b8e3e2f1fef3f..f3d473f5e5d654c7f31b68ae566bf405193d5c70 100644 (file)
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -992,7 +992,8 @@ int mnt_context_next_umount(struct libmnt_context *cxt,
                tgt = mnt_fs_get_target(*fs);
        } while (!tgt);
 
-       DBG(CXT, ul_debugobj(cxt, "next-umount: trying %s", tgt));
+       DBG(CXT, ul_debugobj(cxt, "next-umount: trying %s [fstype: %s, t-pattern: %s, options: %s, O-pattern: %s]", tgt,
+                                mnt_fs_get_fstype(*fs), cxt->fstype_pattern, mnt_fs_get_options(*fs), cxt->optstr_pattern));
 
        /* ignore filesystems which don't match options patterns */
        if ((cxt->fstype_pattern && !mnt_fs_match_fstype(*fs,
@@ -1003,12 +1004,8 @@ int mnt_context_next_umount(struct libmnt_context *cxt,
                                        cxt->optstr_pattern))) {
                if (ignored)
                        *ignored = 1;
-               DBG(CXT, ul_debugobj(cxt, "next-umount: not-match "
-                               "[fstype: %s, t-pattern: %s, options: %s, O-pattern: %s]",
-                               mnt_fs_get_fstype(*fs),
-                               cxt->fstype_pattern,
-                               mnt_fs_get_options(*fs),
-                               cxt->optstr_pattern));
+
+               DBG(CXT, ul_debugobj(cxt, "next-umount: not-match"));
                return 0;
        }
 

diff --git a/libmount/src/version.c b/libmount/src/version.c
index d0f61c9283524336359364bd8e71b59f10c8bd16..b9902b9d976af9f2b598d0f474d25ff603eb7b6e 100644 (file)
--- a/libmount/src/version.c
+++ b/libmount/src/version.c
@@ -28,6 +28,9 @@ static const char *lib_features[] = {
 #ifdef HAVE_BTRFS_SUPPORT
        "btrfs",
 #endif
+#ifdef USE_LIBMOUNT_FORCE_MOUNTINFO
+       "force-mountinfo",
+#endif
 #if !defined(NDEBUG)
        "assert",       /* libc assert.h stuff */
 #endif