[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 07f6a51a20cacad8cbfa933ab2af4365cdd30505

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 1911 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  07f6a51a20cacad8cbfa933ab2af4365cdd30505 (commit)
      from  af4a2049ab5607ac1c72dc915520c16d438ab335 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 07f6a51a20cacad8cbfa933ab2af4365cdd30505
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Sep 10 16:30:31 2024 +0000

    make.sh: Copy the proxy configuration whenever we enable networking
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 make.sh | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/make.sh b/make.sh
index 737ad1161..21543c667 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=*)


hooks/post-receive
--
IPFire 2.x development tree