[PATCH 1/6] config: wrap xfs_metadump as $XFS_METADUMP_PROG like the other tools

Darrick J. Wong
2021-02-10T02:57:16Z

From: Darrick J. Wong <djwong@kernel.org>

When we set up a fstests run, preserve the path xfs_metadump binary with
an $XFS_METADUMP_PROG wrapper, like we do for the other xfsprogs tools.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
common/config | 1 +
common/rc | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/config b/common/config
index d83dfb28..d4cf8089 100644
--- a/common/config
+++ b/common/config
@@ -156,6 +156,7 @@ MKSWAP_PROG="$MKSWAP_PROG -f"
export XFS_LOGPRINT_PROG="$(type -P xfs_logprint)"
export XFS_REPAIR_PROG="$(type -P xfs_repair)"
export XFS_DB_PROG="$(type -P xfs_db)"
+export XFS_METADUMP_PROG="$(type -P xfs_metadump)"
export XFS_ADMIN_PROG="$(type -P xfs_admin)"
export XFS_GROWFS_PROG=$(type -P xfs_growfs)
export XFS_SPACEMAN_PROG="$(type -P xfs_spaceman)"
diff --git a/common/rc b/common/rc
index 649b1cfd..ad54b3de 100644
--- a/common/rc
+++ b/common/rc
@@ -509,7 +509,7 @@ _scratch_metadump()
[ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
options="-l $SCRATCH_LOGDEV"

- xfs_metadump $options "$@" $SCRATCH_DEV $dumpfile
+ $XFS_METADUMP_PROG $options "$@" $SCRATCH_DEV $dumpfile
}

_setup_large_ext4_fs()