config: wrap xfs_metadump as $XFS_METADUMP_PROG like the other tools

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>

diff --git a/common/config b/common/config
index d83dfb289037df5a2c1404910e9612c7864e83a4..d4cf8089005178b4cc06e4c078a59089dd8d398c 100644 (file)
--- 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_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)"
 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 7254130ffe22f19b78d9329336cf5ac8d78bd1a6..dbd91a31b866e7fba023d1e8e5037e5465ade759 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"
 
        [ "$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()
 }
 
 _setup_large_ext4_fs()