diff options
| author | Karel Zak | 2016-02-01 11:01:44 +0100 |
|---|---|---|
| committer | Karel Zak | 2016-02-01 11:01:44 +0100 |
| commit | 314c3358d53b99338d32f30dde720bf173e61c1b (patch) | |
| tree | 3d8e3f32075e960ae1cb5d83218072640c6569bf | |
| parent | Merge branch 'fix_pylibmount_install' of https://github.com/filbranden/util-l... (diff) | |
| download | kernel-qcow2-util-linux-314c3358d53b99338d32f30dde720bf173e61c1b.tar.gz kernel-qcow2-util-linux-314c3358d53b99338d32f30dde720bf173e61c1b.tar.xz kernel-qcow2-util-linux-314c3358d53b99338d32f30dde720bf173e61c1b.zip | |
libmount: add 'force-mountinfo' to features list, improve debug
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | libmount/src/context_umount.c | 11 | ||||
| -rw-r--r-- | libmount/src/version.c | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c index 873dd06bf..f3d473f5e 100644 --- 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 d0f61c928..b9902b9d9 100644 --- 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 |