From 07f6a51a20cacad8cbfa933ab2af4365cdd30505 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 10 Sep 2024 16:30:31 +0000 Subject: [PATCH] make.sh: Copy the proxy configuration whenever we enable networking Signed-off-by: Michael Tremer --- make.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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=*) -- 2.39.5