On Tue, Oct 11, 2022 at 06:45:44PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@xxxxxxxxxx>
>
> Use $E2IMAGE_PROG, not e2image, and check that it exists before
> proceeding.
>
> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> ---
Make sense,
Reviewed-by: Zorro Lang <zlang@xxxxxxxxxx>
> common/populate | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>
> diff --git a/common/populate b/common/populate
> index 66c55b682f..05bdfe33c5 100644
> --- a/common/populate
> +++ b/common/populate
> @@ -18,6 +18,7 @@ _require_populate_commands() {
> ;;
> ext*)
> _require_command "$DUMPE2FS_PROG" "dumpe2fs"
> + _require_command "$E2IMAGE_PROG" "e2image"
> ;;
> esac
> }
> @@ -874,7 +875,7 @@ _scratch_populate_restore_cached() {
> return $res
> ;;
> "ext2"|"ext3"|"ext4")
> - e2image -r "${metadump}" "${SCRATCH_DEV}"
> + $E2IMAGE_PROG -r "${metadump}" "${SCRATCH_DEV}"
> ret=$?
> test $ret -ne 0 && return $ret
>
>
