]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
make.sh: Copy the proxy configuration whenever we enable networking
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 10 Sep 2024 16:30:31 +0000 (16:30 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 10 Sep 2024 16:30:31 +0000 (16:30 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
make.sh

diff --git a/make.sh b/make.sh
index 737ad1161afc5549c049d488aa0f5dba667784e8..21543c667e80fd08c5d916c0c4a7e7c832a17017 100755 (executable)
--- 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=*)