1From f0420b201f2fb5286ccf5657faa6b38cd2680e10 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 8 Apr 2021 14:08:06 +0800
4Subject: [PATCH 2/2] support to override /usr/bin/arch-test
5
6Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55]
7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9---
10 debootstrap | 12 ++++++++----
11 1 file changed, 8 insertions(+), 4 deletions(-)
12
13diff --git a/debootstrap b/debootstrap
14index 9b9e58d..a3cf3af 100755
15--- a/debootstrap
16+++ b/debootstrap
17@@ -51,6 +51,10 @@ INRELEASE_PATH=""
18 DEF_MIRROR="http://deb.debian.org/debian"
19 DEF_HTTPS_MIRROR="https://deb.debian.org/debian"
20
21+if [ -z "$ARCH_TEST" ]; then
22+	ARCH_TEST="/usr/bin/arch-test"
23+fi
24+
25 # set $CONTAINER
26 detect_container
27
28@@ -645,12 +649,12 @@ fi
29
30 ###########################################################################
31
32-if [ -x /usr/bin/arch-test ] && am_doing_phase second_stage; then
33+if [ -x ${ARCH_TEST} ] && am_doing_phase second_stage; then
34 	if doing_variant fakechroot; then
35-		ret=0; arch-test "$ARCH" || ret=$?
36+		ret=0; ${ARCH_TEST} "$ARCH" || ret=$?
37 	# Avoid failure with old arch-test package
38-	elif arch-test --version > /dev/null 2>&1; then
39-		ret=0; arch-test -c "$TARGET" "$ARCH" || ret=$?
40+	elif ${ARCH_TEST} --version > /dev/null 2>&1; then
41+		ret=0; ${ARCH_TEST} -c "$TARGET" "$ARCH" || ret=$?
42 	else
43 		ret=3
44 	fi
45--
462.17.1
47
48