config: wrap xfs_metadump as $XFS_METADUMP_PROG like the other tools
authorDarrick J. Wong <djwong@kernel.org>
Wed, 10 Feb 2021 02:56:25 +0000 (18:56 -0800)
committerEryu Guan <guaneryu@gmail.com>
Sun, 7 Mar 2021 14:36:15 +0000 (22:36 +0800)
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>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
common/config
common/rc

index d83dfb2..d4cf808 100644 (file)
@@ -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)"
index 7254130..dbd91a3 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -499,7 +499,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()