From: Darrick J. Wong <djwong@xxxxxxxxxx>
On my system, the path to the xfsrestore binary is:
/code/xfsdump/build-x86_64/restore/xfsrestore
The grep command in _require_xfsrestore_xflag matches on the "build-x86"
part, even though my version of xfsrestore does not actually have a -x
flag. Fix the string parsing to match entire words so that we only look
for -x in the help output.
(Maybe someone should patch xfsrestore -h to report basename(argv[0])
instead of argv[0]...)
Fixes: 1ffa16c573 ("xfs: test for fixing wrong root inode number in dump")
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
common/xfs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/xfs b/common/xfs
index ba59889c3b..97c049e2ca 100644
--- a/common/xfs
+++ b/common/xfs
@@ -1529,7 +1529,7 @@ _xfs_filter_mkfs()
_require_xfsrestore_xflag()
{
- $XFSRESTORE_PROG -h 2>&1 | grep -q -e '-x' || \
+ $XFSRESTORE_PROG -h 2>&1 | grep -q -w -e '-x' || \
_notrun 'xfsrestore does not support -x flag.'
}
