From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 10 Sep 2024 16:30:31 +0000 (+0000)
Subject: make.sh: Copy the proxy configuration whenever we enable networking
X-Git-Tag: v2.29-core189~65^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07f6a51a20cacad8cbfa933ab2af4365cdd30505;p=ipfire-2.x.git

make.sh: Copy the proxy configuration whenever we enable networking

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/make.sh b/make.sh
index 737ad1161a..21543c667e 100755
--- a/make.sh
+++ b/make.sh
@@ -571,19 +571,12 @@ prepareenv() {
 }
 
 entershell() {
-	local environ=(
-		# HTTP(S) Proxy
-		"https_proxy=${https_proxy}"
-		"http_proxy=${http_proxy}"
-	)
-
 	echo "Entering to a shell inside the build environment, go out with exit"
 
 	local PS1="ipfire build chroot (${BUILD_ARCH}) \u:\w\$ "
 
 	# Run an interactive shell
-	execute --chroot --interactive --network \
-		"${environ[@]}" bash -i
+	execute --chroot --interactive --network bash -i
 }
 
 lfsmakecommoncheck() {
@@ -760,6 +753,12 @@ execute() {
 
 			--network)
 				network="true"
+
+				# Export the proxy configuration
+				environ+=(
+					[https_proxy]="${https_proxy}"
+					[http_proxy]="${http_proxy}"
+				)
 				;;
 
 			--timer=*)