From: Karel Zak <kzak@redhat.com>
Date: Thu, 22 Aug 2024 09:31:21 +0000 (+0200)
Subject: Merge branch 'findmnt-Q' of https://github.com/masatake/util-linux
X-Git-Tag: v2.42-start~231
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8326c99a76526e614f5c779c3601a2cc471467e0;p=thirdparty%2Futil-linux.git

Merge branch 'findmnt-Q' of https://github.com/masatake/util-linux

* 'findmnt-Q' of https://github.com/masatake/util-linux:
  tests: (findmnt) add a case testing -Q option
  findmnt: (man) write about -Q,--filter option
  findmnt: add -Q,--filter option
  findmnt: (refactor) convert add_column macro to a function
  findmnt: (refactor) add a helper function making an instance of libscols_table
  findmnt: (refactor) remove global variables shared between findmnt.c and fintmnt-verify.c
---

8326c99a76526e614f5c779c3601a2cc471467e0
diff --cc misc-utils/findmnt-verify.c
index ecb51d9cfc,ae8bf535e8..2a220dc596
--- a/misc-utils/findmnt-verify.c
+++ b/misc-utils/findmnt-verify.c
@@@ -446,15 -448,15 +448,15 @@@ static int verify_fstype(struct verify_
  	}
  
  	errno = 0;
- 	realtype = mnt_get_fstype(src, &ambi, cache);
+ 	realtype = mnt_get_fstype(src, &ambi, findmnt->cache);
  
  	if (!realtype) {
 -		const char *reson = errno ? strerror(errno) : _("reason unknown");
 +		const char *reason = errno ? strerror(errno) : _("reason unknown");
  
  		if (isauto)
 -			verify_err(vfy, _("cannot detect on-disk filesystem type (%s)"), reson);
 +			verify_err(vfy, _("cannot detect on-disk filesystem type (%s)"), reason);
  		else
 -			verify_warn(vfy, _("cannot detect on-disk filesystem type (%s)"), reson);
 +			verify_warn(vfy, _("cannot detect on-disk filesystem type (%s)"), reason);
  		goto done;
  	}